diff options
author | Kevin Wolf <kwolf@redhat.com> | 2013-09-18 17:22:02 +0200 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2013-10-11 16:50:01 +0200 |
commit | 14d36307ffdf949df9c1dd7f435e138b36f63bb0 (patch) | |
tree | 54218dd8d67c9ae658b297b9b38b4e4b94f27714 /scripts/qapi-types.py | |
parent | 52c8d629cac27ad16dd51507b4733d46fa4efc55 (diff) | |
download | hqemu-14d36307ffdf949df9c1dd7f435e138b36f63bb0.zip hqemu-14d36307ffdf949df9c1dd7f435e138b36f63bb0.tar.gz |
qapi-types/visit.py: Pass whole expr dict for structs
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'scripts/qapi-types.py')
-rw-r--r-- | scripts/qapi-types.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py index 5222463..566fe5e 100644 --- a/scripts/qapi-types.py +++ b/scripts/qapi-types.py @@ -71,7 +71,7 @@ def generate_struct_fields(members): c_name=c_var(argname)) if structured: push_indent() - ret += generate_struct("", argname, argentry) + ret += generate_struct({ "field": argname, "data": argentry}) pop_indent() else: ret += mcgen(''' @@ -81,7 +81,12 @@ def generate_struct_fields(members): return ret -def generate_struct(structname, fieldname, members): +def generate_struct(expr): + + structname = expr.get('type', "") + fieldname = expr.get('field', "") + members = expr['data'] + ret = mcgen(''' struct %(name)s { @@ -417,7 +422,7 @@ if do_builtins: for expr in exprs: ret = "\n" if expr.has_key('type'): - ret += generate_struct(expr['type'], "", expr['data']) + "\n" + ret += generate_struct(expr) + "\n" ret += generate_type_cleanup_decl(expr['type'] + "List") fdef.write(generate_type_cleanup(expr['type'] + "List") + "\n") ret += generate_type_cleanup_decl(expr['type']) |