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/alternate-nested.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/alternate-nested.json')
-rw-r--r-- | tests/qapi-schema/alternate-nested.json | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/qapi-schema/alternate-nested.json b/tests/qapi-schema/alternate-nested.json index ed2b6b7055..c4233b9f33 100644 --- a/tests/qapi-schema/alternate-nested.json +++ b/tests/qapi-schema/alternate-nested.json @@ -1,7 +1,5 @@ -# we reject a nested anonymous union branch -{ 'union': 'Union1', - 'discriminator': {}, +# we reject a nested alternate branch +{ 'alternate': 'Alt1', 'data': { 'name': 'str', 'value': 'int' } } -{ 'union': 'Union2', - 'discriminator': {}, - 'data': { 'nested': 'Union1' } } +{ 'alternate': 'Alt2', + 'data': { 'nested': 'Alt1' } } |