diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-08-31 15:37:42 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2015-09-04 15:47:16 +0200 |
| commit | 65fbe125451da9421070ab03944c9600a264eefc (patch) | |
| tree | 1150b463d7d82dced46cce947c4fe9cbc08e54b3 | |
| parent | 3a864e7c52af15017d5082a9ee39a7919f46d2b5 (diff) | |
| download | focaccia-qemu-65fbe125451da9421070ab03944c9600a264eefc.tar.gz focaccia-qemu-65fbe125451da9421070ab03944c9600a264eefc.zip | |
qapi: Drop one of two "simple union must not have base" checks
The first check ensures the second one can't trigger. Drop the first one, because the second one is in a more logical place, and emits a nicer error message. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
| -rw-r--r-- | scripts/qapi.py | 8 | ||||
| -rw-r--r-- | tests/qapi-schema/union-base-no-discriminator.err | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/scripts/qapi.py b/scripts/qapi.py index 23c32fe3dd..197db77a9f 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -526,14 +526,6 @@ def check_union(expr, expr_info): members = expr['data'] values = { 'MAX': '(automatic)' } - # If the object has a member 'base', its value must name a struct, - # and there must be a discriminator. - if base is not None: - if discriminator is None: - raise QAPIExprError(expr_info, - "Union '%s' requires a discriminator to go " - "along with base" %name) - # Two types of unions, determined by discriminator. # With no discriminator it is a simple union. diff --git a/tests/qapi-schema/union-base-no-discriminator.err b/tests/qapi-schema/union-base-no-discriminator.err index fc8b79c459..8b7a24260f 100644 --- a/tests/qapi-schema/union-base-no-discriminator.err +++ b/tests/qapi-schema/union-base-no-discriminator.err @@ -1 +1 @@ -tests/qapi-schema/union-base-no-discriminator.json:11: Union 'TestUnion' requires a discriminator to go along with base +tests/qapi-schema/union-base-no-discriminator.json:11: Simple union 'TestUnion' must not have a base |