From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60845) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ze96g-0008HV-Ro for qemu-devel@nongnu.org; Mon, 21 Sep 2015 17:58:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ze96f-0001Bk-MU for qemu-devel@nongnu.org; Mon, 21 Sep 2015 17:58:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46847) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ze96f-0001BV-HP for qemu-devel@nongnu.org; Mon, 21 Sep 2015 17:58:41 -0400 From: Eric Blake Date: Mon, 21 Sep 2015 15:57:58 -0600 Message-Id: <1442872682-6523-43-git-send-email-eblake@redhat.com> In-Reply-To: <1442872682-6523-1-git-send-email-eblake@redhat.com> References: <1442872682-6523-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 v5 42/46] 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 , marcandre.lureau@redhat.com, =?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?= , armbru@redhat.com, ehabkost@redhat.com 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> Signed-off-by: Eric Blake --- qapi/opts-visitor.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c index b2cd5b3..900b2fa 100644 --- a/qapi/opts-visitor.c +++ b/qapi/opts-visitor.c @@ -149,6 +149,12 @@ opts_start_struct(Visitor *v, void **obj, const char= *kind, } } +static void +opts_start_implicit_struct(Visitor *v, void **obj, size_t size, Error **= errp) +{ + opts_start_struct(v, obj, NULL, NULL, size, errp); +} + static gboolean ghr_true(gpointer ign_key, gpointer ign_value, gpointer ign_user_data) @@ -185,6 +191,12 @@ opts_end_struct(Visitor *v, Error **errp) ov->fake_id_opt =3D NULL; } +static void +opts_end_implicit_struct(Visitor *v, Error **errp) +{ + opts_end_struct(v, errp); +} + static GQueue * lookup_distinct(const OptsVisitor *ov, const char *name, Error **errp) @@ -508,6 +520,9 @@ opts_visitor_new(const QemuOpts *opts) ov->visitor.start_struct =3D &opts_start_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