From patchwork Wed Dec 23 20:55:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 560729 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id EEDA4140662 for ; Thu, 24 Dec 2015 07:58:29 +1100 (AEDT) Received: from localhost ([::1]:57813 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBqUN-0004f1-Pb for incoming@patchwork.ozlabs.org; Wed, 23 Dec 2015 15:58:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34161) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBqRv-0007p9-3g for qemu-devel@nongnu.org; Wed, 23 Dec 2015 15:55:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aBqRu-00011M-2r for qemu-devel@nongnu.org; Wed, 23 Dec 2015 15:55:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36275) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBqRt-000115-S9 for qemu-devel@nongnu.org; Wed, 23 Dec 2015 15:55:53 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 688808E254; Wed, 23 Dec 2015 20:55:53 +0000 (UTC) Received: from red.redhat.com (ovpn-113-191.phx2.redhat.com [10.3.113.191]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tBNKtl91028439; Wed, 23 Dec 2015 15:55:53 -0500 From: Eric Blake To: qemu-devel@nongnu.org Date: Wed, 23 Dec 2015 13:55:37 -0700 Message-Id: <1450904145-17721-9-git-send-email-eblake@redhat.com> In-Reply-To: <1450904145-17721-1-git-send-email-eblake@redhat.com> References: <1450904145-17721-1-git-send-email-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Michael Roth , armbru@redhat.com, =?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?= Subject: [Qemu-devel] [PATCH v6 08/16] qapi: support implicit structs in OptsVisitor X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Kővágó, Zoltán They are required for flat unions (you still have to allocate the structs). Signed-off-by: Kővágó, Zoltán Message-Id: <88451f26df139c09b56b1525f3c5afeea43dd3db.1441627175.git.DirtY.iCE.hu@gmail.com> [rebase to latest tree] Signed-off-by: Eric Blake --- v6: rebase from original posting and add to series --- qapi/opts-visitor.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c index 28f9a8a..286d655 100644 --- a/qapi/opts-visitor.c +++ b/qapi/opts-visitor.c @@ -157,6 +157,12 @@ opts_start_struct(Visitor *v, const char *name, void **obj, return result; } +static bool +opts_start_implicit_struct(Visitor *v, void **obj, size_t size, Error **errp) +{ + return opts_start_struct(v, NULL, obj, size, errp); +} + static void opts_check_struct(Visitor *v, Error **errp) @@ -199,6 +205,12 @@ opts_end_struct(Visitor *v) ov->fake_id_opt = NULL; } +static void +opts_end_implicit_struct(Visitor *v) +{ + opts_end_struct(v); +} + static GQueue * lookup_distinct(const OptsVisitor *ov, const char *name, Error **errp) @@ -521,6 +533,9 @@ opts_visitor_new(const QemuOpts *opts) ov->visitor.check_struct = &opts_check_struct; ov->visitor.end_struct = &opts_end_struct; + ov->visitor.start_implicit_struct = &opts_start_implicit_struct; + ov->visitor.end_implicit_struct = &opts_end_implicit_struct; + ov->visitor.start_list = &opts_start_list; ov->visitor.next_list = &opts_next_list; ov->visitor.end_list = &opts_end_list;