diff options
author | Eric Blake <eblake@redhat.com> | 2015-05-04 09:05:13 -0600 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2015-05-05 18:39:00 +0200 |
commit | ab916faddd16f0165e9cc2551f90699be8efde53 (patch) | |
tree | a1bb9e4b8cb26b9a76e67de714ce4d3ad1f9fd52 /tests/qapi-schema/flat-union-bad-discriminator.json | |
parent | 7b1b98c420355ccea98d8bd55c9193ee6b7cef97 (diff) |
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>
Diffstat (limited to 'tests/qapi-schema/flat-union-bad-discriminator.json')
-rw-r--r-- | tests/qapi-schema/flat-union-bad-discriminator.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/qapi-schema/flat-union-bad-discriminator.json b/tests/qapi-schema/flat-union-bad-discriminator.json index 3ce43e8356..982f072555 100644 --- a/tests/qapi-schema/flat-union-bad-discriminator.json +++ b/tests/qapi-schema/flat-union-bad-discriminator.json @@ -1,4 +1,5 @@ # we require the discriminator to be a string naming a base-type member +# this tests the old syntax for anonymous unions before we added alternates { 'enum': 'TestEnum', 'data': [ 'value1', 'value2' ] } { 'type': 'TestBase', @@ -9,6 +10,6 @@ 'data': { 'integer': 'int' } } { 'union': 'TestUnion', 'base': 'TestBase', - 'discriminator': [], + 'discriminator': {}, 'data': { 'kind1': 'TestTypeA', 'kind2': 'TestTypeB' } } |