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

qapi: Permit alternates with just one branch

Browse source 
A union or alternate without branches makes no sense and doesn't work:
it can't be instantiated.  A union or alternate with just one branch
works, but is degenerate.  We accept the former, but reject the
latter.  Weird.  docs/devel/qapi-code-gen.txt doesn't mention the
difference.  It claims an alternate definition is "is similar to a
simple union type".

Permit degenerate alternates to make them consistent with unions.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20190913201349.24332-10-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2019-09-13 22:13:42 +02:00
parent 675b214bc6
commit f03255362a
5 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/qapi/common.py
View file

@ -920,11 +920,9 @@ def check_alternate(expr, info):
members = expr['data']
types_seen = {}
# Check every branch; require at least two branches
if len(members) < 2:
if len(members) == 0:
raise QAPISemError(info,
"Alternate '%s' should have at least two branches "
"in 'data'" % name)
"Alternate '%s' cannot have empty 'data'" % name)
for (key, value) in members.items():
check_name(info, "Member of alternate '%s'" % name, key)
check_known_keys(info,