From patchwork Wed Oct 31 22:35:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 196055 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DC2C62C0233 for ; Thu, 1 Nov 2012 10:28:35 +1100 (EST) Received: from localhost ([::1]:47973 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTguX-00029H-5R for incoming@patchwork.ozlabs.org; Wed, 31 Oct 2012 18:37:21 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34686) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTgtx-0000i0-KA for qemu-devel@nongnu.org; Wed, 31 Oct 2012 18:36:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTgtt-0005mn-Hw for qemu-devel@nongnu.org; Wed, 31 Oct 2012 18:36:45 -0400 Received: from mail-ia0-f173.google.com ([209.85.210.173]:37027) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTgtt-0005ku-Cl for qemu-devel@nongnu.org; Wed, 31 Oct 2012 18:36:41 -0400 Received: by mail-ia0-f173.google.com with SMTP id m10so1511545iam.4 for ; Wed, 31 Oct 2012 15:36:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=6ox1CREDEj4GYMEAcKMtWxcVJjUCwu0YG3hFxdEpSV8=; b=kf4uArT/fBP4am5F4G4wf5saYCJDvnQ3ydevbxcMaXlFlOTwi20BZRK2xZJ36jEIO+ 9fwMgllSfCtNO6JpTLeTbIxIRSava1eY/7KZUd8aFg81MoYsd9NuAf8X4zczbjvgErLz XeU0w23FC/uEfNtqdOOAcLP/ZRr/S49tfn6e8Zwk02spceUrm/Oo03F/4WJ1i8Th8QB6 S58DQGeszUnGWzEjTB3zRGc3iJTqpYM0N50hltbTLVw6usNkZ4NJdZh5X7iqn3zH/iZO N6moo08/Pe1TlytqHRbFQxZ4axOkMaPsrKrIkdjASMx2/2U0RXHfpY9TsiHgla3CDOZ0 i4hw== Received: by 10.50.149.225 with SMTP id ud1mr2807497igb.32.1351723001065; Wed, 31 Oct 2012 15:36:41 -0700 (PDT) Received: from loki.morrigu.org (cpe-72-179-62-111.austin.res.rr.com. [72.179.62.111]) by mx.google.com with ESMTPS id hg2sm11556858igc.3.2012.10.31.15.36.39 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 31 Oct 2012 15:36:40 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Wed, 31 Oct 2012 17:35:51 -0500 Message-Id: <1351722972-17801-8-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1351722972-17801-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1351722972-17801-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.210.173 Cc: kwolf@redhat.com, peter.maydell@linaro.org, aliguori@us.ibm.com, blauwirbel@gmail.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH 07/28] qapi: qapi_visit.py, support for visiting non-pointer/embedded structs 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 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);