diff options
| author | Max Reitz <mreitz@redhat.com> | 2014-08-20 19:59:34 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2014-09-22 11:39:33 +0100 |
| commit | e775ba7721181e3ff6677b91f0464968330988d9 (patch) | |
| tree | e4c7f6f28212c14c028352c4e951312710d47e5e | |
| parent | 7b17ce60cc58b3c20b3e708a2d69f6bbe2b4edfa (diff) | |
| download | qemu-e775ba7721181e3ff6677b91f0464968330988d9.zip qemu-e775ba7721181e3ff6677b91f0464968330988d9.tar.gz qemu-e775ba7721181e3ff6677b91f0464968330988d9.tar.bz2 | |
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>
| -rw-r--r-- | scripts/qapi-types.py | 2 | ||||
| -rw-r--r-- | scripts/qapi-visit.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py index b463232..d2f815b 100644 --- a/scripts/qapi-types.py +++ b/scripts/qapi-types.py @@ -177,6 +177,8 @@ const int %(name)s_qtypes[QTYPE_MAX] = { 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 index c129697..df9f7fb 100644 --- a/scripts/qapi-visit.py +++ b/scripts/qapi-visit.py @@ -263,7 +263,8 @@ void visit_type_%(name)s(Visitor *m, %(name)s **obj, const char *name, Error **e 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(''' |