qemu/tests/qapi-schema/flat-union-invalid-if-discriminator.err at 887a2069f76fa99b9755467126dd171a9bad34a3 - motorhead/qemu - 208 Concepts

motorhead/qemu

mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 16:23:55 -06:00

Markus Armbruster 887a2069f7 qapi: Fix broken discriminator error messages

check_union() checks the discriminator exists in base and makes sense.
Two error messages mention the base.  These are broken for anonymous
bases, as demonstrated by tests flat-union-invalid-discriminator and
flat-union-invalid-if-discriminator.err.  The third one doesn't
bother.

First broken when commit ac4338f8eb "qapi: Allow anonymous base for
flat union" (v2.6.0) neglected to adjust the "not a member of base"
error message.  Commit ccadd6bcba "qapi: Add 'if' to implicit struct
members" (v4.0.0) then cloned the flawed error message.

Dumb them down not to mention the base.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190914153506.2151-11-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>

2019-09-24 14:07:23 +02:00

1 line

133 B

Text

Raw Blame History

tests/qapi-schema/flat-union-invalid-if-discriminator.json:10: The discriminator 'enum1' for union TestUnion must not be conditional