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-conflict-dict.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-conflict-dict.json')
| -rw-r--r-- | tests/qapi-schema/alternate-conflict-dict.json | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/qapi-schema/alternate-conflict-dict.json b/tests/qapi-schema/alternate-conflict-dict.json index ded302edae..fcb3e36cd9 100644 --- a/tests/qapi-schema/alternate-conflict-dict.json +++ b/tests/qapi-schema/alternate-conflict-dict.json @@ -1,9 +1,8 @@ -# we reject anonymous unions with multiple object branches +# we reject alternates with multiple object branches { 'type': 'One', 'data': { 'name': 'str' } } { 'type': 'Two', 'data': { 'value': 'int' } } -{ 'union': 'MyUnion', - 'discriminator': {}, +{ 'alternate': 'Alt', 'data': { 'one': 'One', 'two': 'Two' } } |