qapi: Use 'alternate' to replace anonymous union
authorEric Blake <eblake@redhat.com>
Mon, 4 May 2015 15:05:13 +0000 (09:05 -0600)
committerMarkus Armbruster <armbru@redhat.com>
Tue, 5 May 2015 16:39:00 +0000 (18:39 +0200)
commitab916faddd16f0165e9cc2551f90699be8efde53
treea1bb9e4b8cb26b9a76e67de714ce4d3ad1f9fd52
parent7b1b98c420355ccea98d8bd55c9193ee6b7cef97
qapi: Use 'alternate' to replace anonymous union

Previous patches have led up to the point where I create the
new meta-type "'alternate':'Foo'".  See the previous patches
for documentation; I intentionally split as much work into
earlier patches to minimize the size of this patch, but a lot
of it is churn due to testsuite fallout after updating to the
new type.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
24 files changed:
qapi/block-core.json
scripts/qapi-types.py
scripts/qapi-visit.py
scripts/qapi.py
tests/qapi-schema/alternate-array.err
tests/qapi-schema/alternate-array.json
tests/qapi-schema/alternate-base.err
tests/qapi-schema/alternate-base.json
tests/qapi-schema/alternate-clash.err
tests/qapi-schema/alternate-clash.json
tests/qapi-schema/alternate-conflict-dict.err
tests/qapi-schema/alternate-conflict-dict.json
tests/qapi-schema/alternate-conflict-string.err
tests/qapi-schema/alternate-conflict-string.json
tests/qapi-schema/alternate-good.json
tests/qapi-schema/alternate-good.out
tests/qapi-schema/alternate-nested.err
tests/qapi-schema/alternate-nested.json
tests/qapi-schema/alternate-unknown.err
tests/qapi-schema/alternate-unknown.json
tests/qapi-schema/flat-union-bad-discriminator.err
tests/qapi-schema/flat-union-bad-discriminator.json
tests/qapi-schema/qapi-schema-test.json
tests/qapi-schema/qapi-schema-test.out