diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-06-10 13:07:43 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2015-06-18 14:19:47 +0200 |
| commit | f9a1427361fe06ac67480d580412dc4ed6f5d03b (patch) | |
| tree | 21bac4486172c5da9ab9a853d014c8e88c2ed58e | |
| parent | 75276710ae0a9f802a9774a8d845a2c84f89305a (diff) | |
qapi: Catch and reject flat union branch of array type
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
| -rw-r--r-- | scripts/qapi.py | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/flat-union-array-branch.err | 11 |
2 files changed, 2 insertions, 11 deletions
diff --git a/scripts/qapi.py b/scripts/qapi.py index 8f2326716c..06d7fc2848 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -580,7 +580,7 @@ def check_union(expr, expr_info): # Each value must name a known type; furthermore, in flat unions, # branches must be a struct with no overlapping member names check_type(expr_info, "Member '%s' of union '%s'" % (key, name), - value, allow_array=True, allow_metas=allow_metas) + value, allow_array=not base, allow_metas=allow_metas) if base: branch_struct = find_struct(value) assert branch_struct diff --git a/tests/qapi-schema/flat-union-array-branch.err b/tests/qapi-schema/flat-union-array-branch.err index b45ef43e51..8ea91eadb2 100644 --- a/tests/qapi-schema/flat-union-array-branch.err +++ b/tests/qapi-schema/flat-union-array-branch.err @@ -1,10 +1 @@ -Traceback (most recent call last): - File "tests/qapi-schema/test-qapi.py", line 19, in <module> - exprs = parse_schema(sys.argv[1]) - File "scripts/qapi.py", line 760, in parse_schema - return check_exprs(schema.exprs) - File "scripts/qapi.py", line 743, in check_exprs - check_union(expr, info) - File "scripts/qapi.py", line 586, in check_union - assert branch_struct -AssertionError +tests/qapi-schema/flat-union-array-branch.json:8: Member 'value1' of union 'TestUnion' cannot be an array |