From patchwork Wed Jul 10 17:52:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 258183 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AD5BC2C0299 for ; Thu, 11 Jul 2013 03:54:50 +1000 (EST) Received: from localhost ([::1]:47908 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UwybF-0003xH-IN for incoming@patchwork.ozlabs.org; Wed, 10 Jul 2013 13:54:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35010) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UwyZV-0001NM-Ev for qemu-devel@nongnu.org; Wed, 10 Jul 2013 13:52:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UwyZT-0004gk-P1 for qemu-devel@nongnu.org; Wed, 10 Jul 2013 13:52:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18095) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UwyZT-0004gC-GK for qemu-devel@nongnu.org; Wed, 10 Jul 2013 13:52:55 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r6AHqsfd002010 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 10 Jul 2013 13:52:54 -0400 Received: from localhost (ovpn-113-20.phx2.redhat.com [10.3.113.20]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r6AHqrDM027275; Wed, 10 Jul 2013 13:52:53 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 10 Jul 2013 13:52:44 -0400 Message-Id: <1373478767-20965-4-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1373478767-20965-1-git-send-email-lcapitulino@redhat.com> References: <1373478767-20965-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [PULL 3/6] qapi.py: Allow top-level type reference for command definitions 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 From: Kevin Wolf If 'data' for a command definition isn't a dict, but a string, it is taken as a (struct) type name and the fields of this struct are directly used as parameters. This is useful for transactionable commands that can use the same type definition for both the transaction action and the arguments of the standalone command. Signed-off-by: Kevin Wolf Reviewed-by: Michael Roth Signed-off-by: Luiz Capitulino --- scripts/qapi.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/scripts/qapi.py b/scripts/qapi.py index 3139994..baf1321 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -106,11 +106,18 @@ def parse_schema(fp): add_enum(expr_eval['enum']) elif expr_eval.has_key('union'): add_enum('%sKind' % expr_eval['union']) + elif expr_eval.has_key('type'): + add_struct(expr_eval) exprs.append(expr_eval) return exprs def parse_args(typeinfo): + if isinstance(typeinfo, basestring): + struct = find_struct(typeinfo) + assert struct != None + typeinfo = struct['data'] + for member in typeinfo: argname = member argentry = typeinfo[member] @@ -180,6 +187,18 @@ def type_name(name): return name enum_types = [] +struct_types = [] + +def add_struct(definition): + global struct_types + struct_types.append(definition) + +def find_struct(name): + global struct_types + for struct in struct_types: + if struct['type'] == name: + return struct + return None def add_enum(name): global enum_types