From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49656) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2oVI-0001Kd-95 for qemu-devel@nongnu.org; Fri, 26 Jul 2013 16:20:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2oVH-0007nd-9A for qemu-devel@nongnu.org; Fri, 26 Jul 2013 16:20:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63902) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2oVG-0007nS-PP for qemu-devel@nongnu.org; Fri, 26 Jul 2013 16:20:42 -0400 From: Kevin Wolf Date: Fri, 26 Jul 2013 22:20:17 +0200 Message-Id: <1374870032-31672-4-git-send-email-kwolf@redhat.com> In-Reply-To: <1374870032-31672-1-git-send-email-kwolf@redhat.com> References: <1374870032-31672-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 03/18] qapi-visit.py: Implement 'base' for unions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org This implements the visitor part of base types for unions. Parsed into QMP, this example schema definition... { 'type': 'BlockOptionsBase', 'data': { 'read-only': 'bool' } } { 'type': 'BlockOptionsQcow2, 'data': { 'lazy-refcounts': 'bool' } } { 'union': 'BlockOptions', 'base': 'BlockOptionsBase', 'data': { 'raw': 'BlockOptionsRaw' 'qcow2': 'BlockOptionsQcow2' } } ...would describe the following JSON object: { "type": "qcow2", "read-only": true, "data": { "lazy-refcounts": false } } Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake --- scripts/qapi-visit.py | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py index a337d80..db6fa44 100644 --- a/scripts/qapi-visit.py +++ b/scripts/qapi-visit.py @@ -151,7 +151,13 @@ 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'] + + base = expr.get('base') + ret = generate_visit_enum('%sKind' % name, members.keys()) ret += mcgen(''' @@ -164,14 +170,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 +388,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