From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:42287) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TMmW7-0005UU-CV for qemu-devel@nongnu.org; Fri, 12 Oct 2012 17:11:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TMmW3-0005uS-6d for qemu-devel@nongnu.org; Fri, 12 Oct 2012 17:11:35 -0400 Received: from mail-ie0-f173.google.com ([209.85.223.173]:36593) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TMmW3-0005iK-33 for qemu-devel@nongnu.org; Fri, 12 Oct 2012 17:11:31 -0400 Received: by mail-ie0-f173.google.com with SMTP id 17so5335456iea.4 for ; Fri, 12 Oct 2012 14:11:30 -0700 (PDT) Sender: fluxion From: Michael Roth Date: Fri, 12 Oct 2012 16:10:49 -0500 Message-Id: <1350076268-18461-8-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1350076268-18461-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1350076268-18461-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v4 07/26] qapi: qapi_visit.py, support for visiting non-pointer/embedded structs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, aliguori@us.ibm.com, blauwirbel@gmail.com, pbonzini@redhat.com Reviewed-by: Anthony Liguori Signed-off-by: Michael Roth --- scripts/qapi_visit.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/qapi_visit.py b/scripts/qapi_visit.py index 856df5e..c531a5a 100644 --- a/scripts/qapi_visit.py +++ b/scripts/qapi_visit.py @@ -145,6 +145,15 @@ if (obj && (*obj)->%(prefix)shas_%(c_name)s) { if annotated: if isinstance(argentry['type'], types.ListType): ret += generate_visit_carray_body(argname, argentry) + elif argentry.has_key('embedded') and argentry['embedded'] == 'true': + 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); -- 1.7.9.5