From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 11/15] qapi: Catch and reject flat union branch of array type
Date: Thu, 18 Jun 2015 14:25:14 +0200 [thread overview]
Message-ID: <1434630318-22452-12-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1434630318-22452-1-git-send-email-armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
scripts/qapi.py | 2 +-
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 8f23267..06d7fc2 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 b45ef43..8ea91ea 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
--
1.9.3
next prev parent reply other threads:[~2015-06-18 12:25 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-18 12:25 [Qemu-devel] [PULL 00/15] QAPI patches Markus Armbruster
2015-06-18 12:25 ` [Qemu-devel] [PULL 01/15] MAINTAINERS: Fix up QAPI and QAPI schema file patterns Markus Armbruster
2015-06-18 12:25 ` [Qemu-devel] [PULL 02/15] qapi: Drop bogus command from docs Markus Armbruster
2015-06-18 12:25 ` [Qemu-devel] [PULL 03/15] qapi: Eliminate superfluous QAPISchema attribute input_dir Markus Armbruster
2015-06-18 12:25 ` [Qemu-devel] [PULL 04/15] qapi: Improve a couple of confusing variable names Markus Armbruster
2015-06-18 12:25 ` [Qemu-devel] [PULL 05/15] qapi: Fix file name in error messages for included files Markus Armbruster
2015-06-18 12:25 ` [Qemu-devel] [PULL 06/15] qapi: Simplify inclusion cycle detection Markus Armbruster
2015-06-18 12:25 ` [Qemu-devel] [PULL 07/15] qapi: Fix to reject stray 't', 'f' and 'n' Markus Armbruster
2015-06-18 12:25 ` [Qemu-devel] [PULL 08/15] qapi: Move exprs checking from parse_schema() to check_exprs() Markus Armbruster
2015-06-18 12:25 ` [Qemu-devel] [PULL 09/15] qapi: Better separate the different kinds of helpers Markus Armbruster
2015-06-18 12:25 ` [Qemu-devel] [PULL 10/15] tests/qapi-schema: New flat union array branch test case Markus Armbruster
2015-06-18 12:25 ` Markus Armbruster [this message]
2015-06-18 12:25 ` [Qemu-devel] [PULL 12/15] qapi-types: Don't filter out expressions with 'gen' Markus Armbruster
2015-06-18 12:25 ` [Qemu-devel] [PULL 13/15] qapi-types: Drop unused members parameters Markus Armbruster
2015-06-18 12:25 ` [Qemu-devel] [PULL 14/15] qapi-types: Split generate_fwd_builtin() off generate_fwd_struct() Markus Armbruster
2015-06-18 12:25 ` [Qemu-devel] [PULL 15/15] qapi-types: Bury code dead since commit 6b5abc7 Markus Armbruster
2015-06-18 13:58 ` [Qemu-devel] [PULL 00/15] QAPI patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1434630318-22452-12-git-send-email-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.