mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-08-23 07:35:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

qapi: Fix to reject union command and event arguments

Browse Source 
A command's or event's 'data' must be a struct type, given either as a
dictionary, or as struct type name.

Commit dd883c6 tightened the checking there, but not enough: we still
accept 'union'.  Fix to reject it.

We may want to support union types there, but we'll have to extend
qapi-commands.py and qapi-events.py for it.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Markus Armbruster
2015-07-01 10:12:24 +02:00
parent d9658d58e3
commit 315932b5ed
6 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/qapi.py
View File

@ -499,7 +499,7 @@ def check_command(expr, expr_info):
check_type(expr_info, "'data' for command '%s'" % name,
expr.get('data'), allow_dict=True, allow_optional=True,
allow_metas=['union', 'struct'], allow_star=allow_star)
allow_metas=['struct'], allow_star=allow_star)
returns_meta = ['union', 'struct']
if name in returns_whitelist:
returns_meta += ['built-in', 'alternate', 'enum']
@ -517,7 +517,7 @@ def check_event(expr, expr_info):
events.append(name)
check_type(expr_info, "'data' for event '%s'" % name,
expr.get('data'), allow_dict=True, allow_optional=True,
allow_metas=['union', 'struct'])
allow_metas=['struct'])
def check_union(expr, expr_info):
name = expr['union']