[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/16] net: Flatten simple union NetLegacyOptions
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 02/16] net: Flatten simple union NetLegacyOptions |
Date: |
Wed, 22 Feb 2017 20:14:44 +0100 |
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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
---
net/net.c | 44 ++++++++++++++++++++++----------------------
qapi-schema.json | 11 +++++++++++
2 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/net/net.c b/net/net.c
index fb7af3a..0ac3b9e 100644
--- a/net/net.c
+++ b/net/net.c
@@ -993,47 +993,47 @@ static int net_client_init1(const void *object, bool
is_netdev, Error **errp)
/* Map the old options to the new flat type */
switch (opts->type) {
- case NET_LEGACY_OPTIONS_KIND_NONE:
+ case NET_LEGACY_OPTIONS_TYPE_NONE:
return 0; /* nothing to do */
- case NET_LEGACY_OPTIONS_KIND_NIC:
+ case NET_LEGACY_OPTIONS_TYPE_NIC:
legacy.type = NET_CLIENT_DRIVER_NIC;
- legacy.u.nic = *opts->u.nic.data;
+ legacy.u.nic = opts->u.nic;
break;
- case NET_LEGACY_OPTIONS_KIND_USER:
+ case NET_LEGACY_OPTIONS_TYPE_USER:
legacy.type = NET_CLIENT_DRIVER_USER;
- legacy.u.user = *opts->u.user.data;
+ legacy.u.user = opts->u.user;
break;
- case NET_LEGACY_OPTIONS_KIND_TAP:
+ case NET_LEGACY_OPTIONS_TYPE_TAP:
legacy.type = NET_CLIENT_DRIVER_TAP;
- legacy.u.tap = *opts->u.tap.data;
+ legacy.u.tap = opts->u.tap;
break;
- case NET_LEGACY_OPTIONS_KIND_L2TPV3:
+ case NET_LEGACY_OPTIONS_TYPE_L2TPV3:
legacy.type = NET_CLIENT_DRIVER_L2TPV3;
- legacy.u.l2tpv3 = *opts->u.l2tpv3.data;
+ legacy.u.l2tpv3 = opts->u.l2tpv3;
break;
- case NET_LEGACY_OPTIONS_KIND_SOCKET:
+ case NET_LEGACY_OPTIONS_TYPE_SOCKET:
legacy.type = NET_CLIENT_DRIVER_SOCKET;
- legacy.u.socket = *opts->u.socket.data;
+ legacy.u.socket = opts->u.socket;
break;
- case NET_LEGACY_OPTIONS_KIND_VDE:
+ case NET_LEGACY_OPTIONS_TYPE_VDE:
legacy.type = NET_CLIENT_DRIVER_VDE;
- legacy.u.vde = *opts->u.vde.data;
+ legacy.u.vde = opts->u.vde;
break;
- case NET_LEGACY_OPTIONS_KIND_DUMP:
+ case NET_LEGACY_OPTIONS_TYPE_DUMP:
legacy.type = NET_CLIENT_DRIVER_DUMP;
- legacy.u.dump = *opts->u.dump.data;
+ legacy.u.dump = opts->u.dump;
break;
- case NET_LEGACY_OPTIONS_KIND_BRIDGE:
+ case NET_LEGACY_OPTIONS_TYPE_BRIDGE:
legacy.type = NET_CLIENT_DRIVER_BRIDGE;
- legacy.u.bridge = *opts->u.bridge.data;
+ legacy.u.bridge = opts->u.bridge;
break;
- case NET_LEGACY_OPTIONS_KIND_NETMAP:
+ case NET_LEGACY_OPTIONS_TYPE_NETMAP:
legacy.type = NET_CLIENT_DRIVER_NETMAP;
- legacy.u.netmap = *opts->u.netmap.data;
+ legacy.u.netmap = opts->u.netmap;
break;
- case NET_LEGACY_OPTIONS_KIND_VHOST_USER:
+ case NET_LEGACY_OPTIONS_TYPE_VHOST_USER:
legacy.type = NET_CLIENT_DRIVER_VHOST_USER;
- legacy.u.vhost_user = *opts->u.vhost_user.data;
+ legacy.u.vhost_user = opts->u.vhost_user;
break;
default:
abort();
@@ -1048,7 +1048,7 @@ static int net_client_init1(const void *object, bool
is_netdev, Error **errp)
/* Do not add to a vlan if it's a nic with a netdev= parameter. */
if (netdev->type != NET_CLIENT_DRIVER_NIC ||
- !opts->u.nic.data->has_netdev) {
+ !opts->u.nic.has_netdev) {
peer = net_hub_add_port(net->has_vlan ? net->vlan : 0, NULL);
}
diff --git a/qapi-schema.json b/qapi-schema.json
index a448ea8..5347781 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',
--
2.7.4
- [Qemu-devel] [PULL 00/16] QAPI patches for 2017-02-22, Markus Armbruster, 2017/02/22
- [Qemu-devel] [PULL 08/16] test-qmp-event: Simplify and tighten event_test_emit(), Markus Armbruster, 2017/02/22
- [Qemu-devel] [PULL 07/16] libqtest: Clean up qmp_response() a bit, Markus Armbruster, 2017/02/22
- [Qemu-devel] [PULL 01/16] numa: Flatten simple union NumaOptions, Markus Armbruster, 2017/02/22
- [Qemu-devel] [PULL 13/16] tests: Don't check qobject_type() before qobject_to_qfloat(), Markus Armbruster, 2017/02/22
- [Qemu-devel] [PULL 10/16] tests: Don't check qobject_type() before qobject_to_qlist(), Markus Armbruster, 2017/02/22
- [Qemu-devel] [PULL 16/16] block: Don't bother asserting type of output visitor's output, Markus Armbruster, 2017/02/22
- [Qemu-devel] [PULL 06/16] check-qjson: Simplify around compare_litqobj_to_qobj(), Markus Armbruster, 2017/02/22
- [Qemu-devel] [PULL 11/16] tests: Don't check qobject_type() before qobject_to_qstring(), Markus Armbruster, 2017/02/22
- [Qemu-devel] [PULL 03/16] qdict: Make qdict_get_qlist() safe like qdict_get_qdict(), Markus Armbruster, 2017/02/22
- [Qemu-devel] [PULL 02/16] net: Flatten simple union NetLegacyOptions,
Markus Armbruster <=
- [Qemu-devel] [PULL 04/16] check-qdict: Simplify qdict_crumple_test_recursive(), Markus Armbruster, 2017/02/22
- [Qemu-devel] [PULL 05/16] check-qdict: Tighten qdict_crumple_test_recursive() some, Markus Armbruster, 2017/02/22
- [Qemu-devel] [PULL 15/16] monitor: Clean up handle_hmp_command() a bit, Markus Armbruster, 2017/02/22
- [Qemu-devel] [PULL 12/16] tests: Don't check qobject_type() before qobject_to_qint(), Markus Armbruster, 2017/02/22
- [Qemu-devel] [PULL 14/16] tests: Don't check qobject_type() before qobject_to_qbool(), Markus Armbruster, 2017/02/22
- [Qemu-devel] [PULL 09/16] Don't check qobject_type() before qobject_to_qdict(), Markus Armbruster, 2017/02/22
- Re: [Qemu-devel] [PULL 00/16] QAPI patches for 2017-02-22, Peter Maydell, 2017/02/24