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 /tests/qapi-schema | |
| 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 'tests/qapi-schema')
| -rw-r--r-- | tests/qapi-schema/args-union.err | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/args-union.exit | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/args-union.json | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/args-union.out | 4 |
4 files changed, 3 insertions, 6 deletions
diff --git a/tests/qapi-schema/args-union.err b/tests/qapi-schema/args-union.err index e69de29bb2..1d693d74da 100644 --- a/tests/qapi-schema/args-union.err +++ b/tests/qapi-schema/args-union.err @@ -0,0 +1 @@ +tests/qapi-schema/args-union.json:4: 'data' for command 'oops' cannot use union type 'Uni' diff --git a/tests/qapi-schema/args-union.exit b/tests/qapi-schema/args-union.exit index 573541ac97..d00491fd7e 100644 --- a/tests/qapi-schema/args-union.exit +++ b/tests/qapi-schema/args-union.exit @@ -1 +1 @@ -0 +1 diff --git a/tests/qapi-schema/args-union.json b/tests/qapi-schema/args-union.json index db97ef643b..7bdcbb7f08 100644 --- a/tests/qapi-schema/args-union.json +++ b/tests/qapi-schema/args-union.json @@ -1,4 +1,4 @@ -# FIXME we should reject union arguments +# we do not allow union arguments # TODO should we support this? { 'union': 'Uni', 'data': { 'case1': 'int', 'case2': 'str' } } { 'command': 'oops', 'data': 'Uni' } diff --git a/tests/qapi-schema/args-union.out b/tests/qapi-schema/args-union.out index 907080cce6..e69de29bb2 100644 --- a/tests/qapi-schema/args-union.out +++ b/tests/qapi-schema/args-union.out @@ -1,4 +0,0 @@ -[OrderedDict([('union', 'Uni'), ('data', OrderedDict([('case1', 'int'), ('case2', 'str')]))]), - OrderedDict([('command', 'oops'), ('data', 'Uni')])] -[{'enum_name': 'UniKind', 'enum_values': None}] -[] |