[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH 04/11] qapi-visit.py: Implement 'base' for union
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [RFC PATCH 04/11] qapi-visit.py: Implement 'base' for unions |
Date: |
Tue, 9 Jul 2013 11:53:30 +0200 |
Signed-off-by: Kevin Wolf <address@hidden>
---
scripts/qapi-visit.py | 33 ++++++++++++++++++++++++++++-----
1 file changed, 28 insertions(+), 5 deletions(-)
diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
index a337d80..3b2e693 100644
--- a/scripts/qapi-visit.py
+++ b/scripts/qapi-visit.py
@@ -151,7 +151,16 @@ void visit_type_%(name)s(Visitor *m, %(name)s * obj, const
char *name, Error **e
''',
name=name)
-def generate_visit_union(name, members):
+def generate_visit_union(expr):
+
+ name = expr['union']
+ members = expr['data']
+
+ if expr.has_key('base'):
+ base = expr['base']
+ else:
+ base = None
+
ret = generate_visit_enum('%sKind' % name, members.keys())
ret += mcgen('''
@@ -164,14 +173,28 @@ void visit_type_%(name)s(Visitor *m, %(name)s ** obj,
const char *name, Error **
visit_start_struct(m, (void **)obj, "%(name)s", name,
sizeof(%(name)s), &err);
if (!err) {
if (obj && *obj) {
- visit_type_%(name)sKind(m, &(*obj)->kind, "type", &err);
- if (!err) {
- switch ((*obj)->kind) {
''',
name=name)
+
+ push_indent()
push_indent()
push_indent()
+
+ if base:
+ struct = find_struct(base)
+ push_indent()
+ ret += generate_visit_struct_fields("", struct['data'])
+ pop_indent()
+
+ pop_indent()
+ ret += mcgen('''
+ visit_type_%(name)sKind(m, &(*obj)->kind, "type", &err);
+ if (!err) {
+ switch ((*obj)->kind) {
+''',
+ name=name)
+
for key in members:
ret += mcgen('''
case %(abbrev)s_KIND_%(enum)s:
@@ -368,7 +391,7 @@ for expr in exprs:
ret = generate_declaration(expr['type'], expr['data'])
fdecl.write(ret)
elif expr.has_key('union'):
- ret = generate_visit_union(expr['union'], expr['data'])
+ ret = generate_visit_union(expr)
ret += generate_visit_list(expr['union'], expr['data'])
fdef.write(ret)
--
1.8.1.4
- [Qemu-devel] [RFC PATCH 00/11] qapi changes in preparation for blockdev-add, Kevin Wolf, 2013/07/09
- [Qemu-devel] [RFC PATCH 01/11] qapi-types.py: Split off generate_struct_fields(), Kevin Wolf, 2013/07/09
- [Qemu-devel] [RFC PATCH 03/11] qapi-visit.py: Split off generate_visit_struct_fields(), Kevin Wolf, 2013/07/09
- [Qemu-devel] [RFC PATCH 04/11] qapi-visit.py: Implement 'base' for unions,
Kevin Wolf <=
- [Qemu-devel] [RFC PATCH 02/11] qapi-types.py: Implement 'base' for unions, Kevin Wolf, 2013/07/09
- [Qemu-devel] [RFC PATCH 05/11] qapi: Add visitor for implicit structs, Kevin Wolf, 2013/07/09
- [Qemu-devel] [RFC PATCH 06/11] qapi: Flat unions with arbitrary discriminator, Kevin Wolf, 2013/07/09
- [Qemu-devel] [RFC PATCH 09/11] Implement qdict_flatten(), Kevin Wolf, 2013/07/09