[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 01/17] qapi-types/visit.py: Pass whole expr dict
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH v2 01/17] qapi-types/visit.py: Pass whole expr dict for structs |
Date: |
Tue, 1 Oct 2013 15:20:03 +0200 |
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
scripts/qapi-types.py | 11 ++++++++---
scripts/qapi-visit.py | 8 ++++++--
2 files changed, 14 insertions(+), 5 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'])
diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
index 597cca4..1e44004 100644
--- a/scripts/qapi-visit.py
+++ b/scripts/qapi-visit.py
@@ -120,7 +120,11 @@ if (!err) {
''')
return ret
-def generate_visit_struct(name, members):
+def generate_visit_struct(expr):
+
+ name = expr['type']
+ members = expr['data']
+
ret = generate_visit_struct_fields(name, "", "", members)
ret += mcgen('''
@@ -472,7 +476,7 @@ if do_builtins:
for expr in exprs:
if expr.has_key('type'):
- ret = generate_visit_struct(expr['type'], expr['data'])
+ ret = generate_visit_struct(expr)
ret += generate_visit_list(expr['type'], expr['data'])
fdef.write(ret)
--
1.8.1.4
- [Qemu-devel] [PATCH v2 00/17] blockdev-add QMP command, Kevin Wolf, 2013/10/01
- [Qemu-devel] [PATCH v2 01/17] qapi-types/visit.py: Pass whole expr dict for structs,
Kevin Wolf <=
- [Qemu-devel] [PATCH v2 02/17] qapi-types/visit.py: Inheritance for structs, Kevin Wolf, 2013/10/01
- [Qemu-devel] [PATCH v2 04/17] blockdev: 'blockdev-add' QMP command, Kevin Wolf, 2013/10/01
- [Qemu-devel] [PATCH v2 06/17] blockdev: Pass QDict to blockdev_init(), Kevin Wolf, 2013/10/01
- [Qemu-devel] [PATCH v2 05/17] blockdev: Separate ID generation from DriveInfo creation, Kevin Wolf, 2013/10/01
- [Qemu-devel] [PATCH v2 10/17] blockdev: Move parsing of 'boot' option to drive_init, Kevin Wolf, 2013/10/01