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 /qapi | |
| 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 'qapi')
| -rw-r--r-- | qapi/block-core.json | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/qapi/block-core.json b/qapi/block-core.json index 1c17224c77..3d20e61dee 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1503,8 +1503,7 @@ # # Since: 2.2 ## -{ 'union': 'Qcow2OverlapChecks', - 'discriminator': {}, +{ 'alternate': 'Qcow2OverlapChecks', 'data': { 'flags': 'Qcow2OverlapCheckFlags', 'mode': 'Qcow2OverlapCheckMode' } } @@ -1795,8 +1794,7 @@ # # Since: 1.7 ## -{ 'union': 'BlockdevRef', - 'discriminator': {}, +{ 'alternate': 'BlockdevRef', 'data': { 'definition': 'BlockdevOptions', 'reference': 'str' } } |