From 89a70ccf822a86d05efb34e50958de831a071d05 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Mon, 9 Sep 2013 14:28:05 +0200 Subject: [PATCH 14/38] qapi.py: Allow top-level type reference for command definitions RH-Author: Kevin Wolf Message-id: <1378736903-18489-15-git-send-email-kwolf@redhat.com> Patchwork-id: 54201 O-Subject: [RHEL-7.0 qemu-kvm PATCH 14/32] qapi.py: Allow top-level type reference for command definitions Bugzilla: 1005818 RH-Acked-by: Fam Zheng RH-Acked-by: Max Reitz RH-Acked-by: Miroslav Rezanina Bugzilla: 1005818 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 (cherry picked from commit b35284ea207a0ae1c0b162344cdef2a83304befc) Signed-off-by: Kevin Wolf --- scripts/qapi.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) Signed-off-by: Miroslav Rezanina --- scripts/qapi.py | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index daedaea..0c3bd84 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -100,11 +100,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] @@ -174,6 +181,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.7.1