From ab916faddd16f0165e9cc2551f90699be8efde53 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 4 May 2015 09:05:13 -0600 Subject: 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 Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- tests/qapi-schema/alternate-good.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tests/qapi-schema/alternate-good.json') diff --git a/tests/qapi-schema/alternate-good.json b/tests/qapi-schema/alternate-good.json index 73d0993b39..99d614f138 100644 --- a/tests/qapi-schema/alternate-good.json +++ b/tests/qapi-schema/alternate-good.json @@ -1,10 +1,9 @@ -# Working example of anonymous union +# Working example of alternate { 'type': 'Data', 'data': { '*number': 'int', '*name': 'str' } } { 'enum': 'Enum', 'data': [ 'hello', 'world' ] } -{ 'union': 'MyUnion', - 'discriminator': {}, +{ 'alternate': 'Alt', 'data': { 'value': 'int', 'string': 'Enum', 'struct': 'Data' } } -- cgit v1.2.3