]> git.ipfire.org Git - thirdparty/qemu.git/commit
qapi: Fix broken discriminator error messages
authorMarkus Armbruster <armbru@redhat.com>
Sat, 14 Sep 2019 15:34:57 +0000 (17:34 +0200)
committerMarkus Armbruster <armbru@redhat.com>
Tue, 24 Sep 2019 12:07:23 +0000 (14:07 +0200)
commit887a2069f76fa99b9755467126dd171a9bad34a3
tree44ca21e5641e1442da0ef61f9174e99b9da7726a
parent9d55380b5aecd4ae5324e7d4ab0a7dfc510b634d
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>
scripts/qapi/common.py
tests/qapi-schema/flat-union-invalid-discriminator.err
tests/qapi-schema/flat-union-invalid-discriminator.json
tests/qapi-schema/flat-union-invalid-if-discriminator.err
tests/qapi-schema/flat-union-invalid-if-discriminator.json
tests/qapi-schema/flat-union-optional-discriminator.err
tests/qapi-schema/union-base-empty.err