From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48496) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UpLFC-0003jA-4H for qemu-devel@nongnu.org; Wed, 19 Jun 2013 12:28:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UpLFA-0003jo-U0 for qemu-devel@nongnu.org; Wed, 19 Jun 2013 12:28:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:4302) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UpLFA-0003jc-LY for qemu-devel@nongnu.org; Wed, 19 Jun 2013 12:28:24 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r5JGSNWd006137 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 19 Jun 2013 12:28:24 -0400 From: Kevin Wolf Date: Wed, 19 Jun 2013 18:28:06 +0200 Message-Id: <1371659287-14331-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1371659287-14331-1-git-send-email-kwolf@redhat.com> References: <1371659287-14331-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 2/3] qapi.py: Allow top-level type reference for command definitions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, armbru@redhat.com, stefanha@redhat.com, lcapitulino@redhat.com 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 --- scripts/qapi.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/scripts/qapi.py b/scripts/qapi.py index 3a64769..e151659 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -82,6 +82,8 @@ def evaluate(string): 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) return expr_eval @@ -107,6 +109,11 @@ def parse_schema(fp): 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] @@ -176,6 +183,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 -- 1.8.1.4