From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Eric Blake 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v6 08/16] qapi: support implicit structs in OptsVisitor List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Michael Roth , armbru@redhat.com, =?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?= From: K=C5=91v=C3=A1g=C3=B3, Zolt=C3=A1n They are required for flat unions (you still have to allocate the structs). Signed-off-by: K=C5=91v=C3=A1g=C3=B3, Zolt=C3=A1n Message-Id: <88451f26df139c09b56b1525f3c5afeea43dd3db.1441627175.git.Dirt= Y.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 =3D 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 =3D &opts_check_struct; ov->visitor.end_struct =3D &opts_end_struct; + ov->visitor.start_implicit_struct =3D &opts_start_implicit_struct; + ov->visitor.end_implicit_struct =3D &opts_end_implicit_struct; + ov->visitor.start_list =3D &opts_start_list; ov->visitor.next_list =3D &opts_next_list; ov->visitor.end_list =3D &opts_end_list; --=20 2.4.3