From patchwork Tue Jul 24 17:20:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [08/22] qapi: qapi_visit.py, support for visiting non-pointer/embedded structs Date: Tue, 24 Jul 2012 07:20:40 -0000 From: Michael Roth X-Patchwork-Id: 173037 Message-Id: <1343150454-4677-9-git-send-email-mdroth@linux.vnet.ibm.com> To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, quintela@redhat.com, owasserm@redhat.com, yamahata@valinux.co.jp, pbonzini@redhat.com, akong@redhat.com, afaerber@suse.de Signed-off-by: Michael Roth Reviewed-by: Anthony Liguori --- scripts/qapi_visit.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/qapi_visit.py b/scripts/qapi_visit.py index 864acb2..8f8cdca 100644 --- a/scripts/qapi_visit.py +++ b/scripts/qapi_visit.py @@ -105,6 +105,15 @@ if (obj && (*obj)->%(prefix)shas_%(c_name)s) { if annotated: if isinstance(argentry['type'], types.ListType): ret += generate_visit_array_body(argname, argentry) + elif argentry.has_key(''): + tmp_ptr_name = "%s_%s_ptr" % (c_var(field_prefix).replace(".", ""), c_var(argname)) + ret += mcgen(''' +%(type)s *%(tmp_ptr)s = &(*obj)->%(c_prefix)s%(c_name)s; +visit_type_%(type)s(m, (obj && *obj) ? &%(tmp_ptr)s : NULL, "%(name)s", errp); +''', + c_prefix=c_var(field_prefix), prefix=field_prefix, + type=type_name(argentry['type']), c_name=c_var(argname), + name=argname, tmp_ptr=tmp_ptr_name) else: ret += mcgen(''' visit_type_%(type)s(m, obj ? &(*obj)->%(c_prefix)s%(c_name)s : NULL, "%(name)s", errp);