qapi: Allow enums in anonymous unions

Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-id: 1408557576-14574-3-git-send-email-mreitz@redhat.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
qemu · Sep 22, 2014 · e775ba7 · e775ba7
1 parent 7b17ce6
commit e775ba7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py
@@ -177,6 +177,8 @@ def generate_anon_union_qtypes(expr):
             qtype = "QTYPE_QDICT"
         elif find_union(qapi_type):
             qtype = "QTYPE_QDICT"
+        elif find_enum(qapi_type):
+            qtype = "QTYPE_QSTRING"
         else:
             assert False, "Invalid anonymous union member"
 

diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
@@ -263,7 +263,8 @@ def generate_visit_anon_union(name, members):
     for key in members:
         assert (members[key] in builtin_types
             or find_struct(members[key])
-            or find_union(members[key])), "Invalid anonymous union member"
+            or find_union(members[key])
+            or find_enum(members[key])), "Invalid anonymous union member"
 
         enum_full_value = generate_enum_full_value(disc_type, key)
         ret += mcgen('''