]> git.ipfire.org Git - thirdparty/qemu.git/commit
qapi: Require all branches of flat union enum to be covered
authorEric Blake <eblake@redhat.com>
Thu, 14 Jul 2016 03:50:13 +0000 (21:50 -0600)
committerMarkus Armbruster <armbru@redhat.com>
Tue, 19 Jul 2016 11:21:08 +0000 (13:21 +0200)
commitd0b182392d0281ef780e3effcb82677a004f1f97
tree3011a96e40c530c43e92fffc4f6d59053b6e7e57
parentcebea510579ed43724156cc596a8ff14ba208740
qapi: Require all branches of flat union enum to be covered

We were previously enforcing that all flat union branches were
found in the corresponding enum, but not that all enum values
were covered by branches.  The resulting generated code would
abort() if the user passes the uncovered enum value.

We don't automatically treat non-present branches in a flat
union as empty types, for symmetry with simple unions (there,
the enum type is generated from the list of all branches, so
there is no way to omit a branch but still have it be part of
the union).

A later patch will add shorthand so that branches that are empty
in flat unions can be declared as 'branch':{} instead of
'branch':'Empty', to avoid the need for an otherwise useless
explicit empty type.  [Such shorthand for simple unions is a bit
harder to justify, since we would still have to generate a
wrapper type that parses 'data':{}, rather than truly being an
empty branch with no additional siblings to the 'type' member.]

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1468468228-27827-3-git-send-email-eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
scripts/qapi.py
tests/Makefile.include
tests/qapi-schema/flat-union-incomplete-branch.err [new file with mode: 0644]
tests/qapi-schema/flat-union-incomplete-branch.exit [new file with mode: 0644]
tests/qapi-schema/flat-union-incomplete-branch.json [new file with mode: 0644]
tests/qapi-schema/flat-union-incomplete-branch.out [new file with mode: 0644]