motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-31 22:33:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qapi: Segregate anonymous unions into alternates in generator

Browse source 
Special-casing 'discriminator == {}' for handling anonymous unions
is getting awkward; since this particular type is not always a
dictionary on the wire, it is easier to treat it as a completely
different class of type, "alternate", so that if a type is listed
in the union_types array, we know it is not an anonymous union.

This patch just further segregates union handling, to make sure that
anonymous unions are not stored in union_types, and splitting up
check_union() into separate functions.  A future patch will change
the qapi grammar, and having the segregation already in place will
make it easier to deal with the distinct meta-type.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Eric Blake 2015-05-04 09:05:10 -06:00 • committed by Markus Armbruster
parent 268a1c5eb1
commit 811d04fd0c
5 changed files with 62 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/qapi-visit.py
View file

@ -237,7 +237,7 @@ void visit_type_%(name)s(Visitor *m, %(name)s *obj, const char *name, Error **er
''',
name=name)
def generate_visit_anon_union(name, members):
def generate_visit_alternate(name, members):
ret = mcgen('''
void visit_type_%(name)s(Visitor *m, %(name)s **obj, const char *name, Error **errp)
@ -302,7 +302,7 @@ def generate_visit_union(expr):
if discriminator == {}:
assert not base
return generate_visit_anon_union(name, members)
return generate_visit_alternate(name, members)
enum_define = discriminator_find_enum_define(expr)
if enum_define: