diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-07-01 10:12:24 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2015-09-04 15:47:15 +0200 |
| commit | 315932b5edb86597adafbd1faa2d29c46499d8c3 (patch) | |
| tree | 4d60c9b364e460937ee0e7fc953835f2d8ed07f7 /scripts | |
| parent | d9658d58e33128df32093b7a84bed76b527fb884 (diff) | |
qapi: Fix to reject union command and event arguments
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>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/qapi.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/qapi.py b/scripts/qapi.py index 487998244b..bbeae4d322 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -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'] |