Commit 65fbe125 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

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: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent 3a864e7c

scripts/qapi.py

+0 −8
Original line number Diff line number Diff line
@@ -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.

tests/qapi-schema/union-base-no-discriminator.err

+1 −1
Original line number Diff line number Diff line 
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