summaryrefslogtreecommitdiff
path: root/qapi-schema.json
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2017-02-21 21:46:27 +0100
committerMarkus Armbruster <armbru@redhat.com>2017-02-22 19:50:52 +0100
commitd3be4b57cefde105299e234f0659b77f37920c72 (patch)
tree58da799c12d29f7a75fee6b24efd8024dd892ec0 /qapi-schema.json
parentd081a49af8c68ad6c8fe9b552e306c5bad7b4e61 (diff)
downloadqemu-d3be4b57cefde105299e234f0659b77f37920c72.tar.gz
net: Flatten simple union NetLegacyOptions
Simple unions are simpler than flat unions in the schema, but more complicated in C and on the QMP wire: there's extra indirection in C and extra nesting on the wire, both pointless. They're best avoided in new code. NetLegacyOptions isn't new, but it's only used internally, not in QMP. Convert it to a flat union. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <1487709988-14322-3-git-send-email-armbru@redhat.com>
Diffstat (limited to 'qapi-schema.json')
-rw-r--r--qapi-schema.json11
1 files changed, 11 insertions, 0 deletions
diff --git a/qapi-schema.json b/qapi-schema.json
index a448ea8767..5347781eca 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -3959,6 +3959,15 @@
'opts': 'NetLegacyOptions' } }
##
+# @NetLegacyOptionsType:
+#
+# Since: 1.2
+##
+{ 'enum': 'NetLegacyOptionsType',
+ 'data': ['none', 'nic', 'user', 'tap', 'l2tpv3', 'socket', 'vde',
+ 'dump', 'bridge', 'netmap', 'vhost-user'] }
+
+##
# @NetLegacyOptions:
#
# Like Netdev, but for use only by the legacy command line options
@@ -3966,6 +3975,8 @@
# Since: 1.2
##
{ 'union': 'NetLegacyOptions',
+ 'base': { 'type': 'NetLegacyOptionsType' },
+ 'discriminator': 'type',
'data': {
'none': 'NetdevNoneOptions',
'nic': 'NetLegacyNicOptions',