[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-ppc] [Qemu-devel] [PATCH v7 11/15] qapi: Change Netdev into a
From: |
Markus Armbruster |
Subject: |
Re: [Qemu-ppc] [Qemu-devel] [PATCH v7 11/15] qapi: Change Netdev into a flat union |
Date: |
Thu, 16 Jun 2016 15:15:12 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) |
Eric Blake <address@hidden> writes:
> From: Kővágó, Zoltán <address@hidden>
>
> Except qapi-schema.json, this patch was generated by:
>
> find . -name .git -prune -o -type f \! -name '*~' -print0 | \
> xargs -0 sed -i \
> -e 's/NetClientOptionsKind/NetClientDriver/g' \
> -e 's/NET_CLIENT_OPTIONS_KIND_/NET_CLIENT_DRIVER_/g' \
> -e 's/netdev->opts/netdev/g'
Uh, this is prone to descend into build trees and edit random crap. I
used
$ sed -i -e ... `git-ls-tree -r HEAD | awk '$2 == "blob" { print $4 }'`
to verify this commit. Differences noted inline.
>
> Signed-off-by: Kővágó, Zoltán <address@hidden>
> Message-Id: <address@hidden>
>
> Additional changes:
> Rebase the patch on top of an earlier change from netdev->kind to
> netdev->type, so that tweak is no longer needed here.
I guess this is the "-e 's/netdev->kind/netdev->type/g'" you deleted
from Zoltán's commit message.
> Rebase to
> latest master which enhanced multiqueue.
>
> Rework so that NetdevLegacy doesn't pollute QMP command but is instead
> copied piecewise into the new Netdev, which means that NetClientOptions
> must still remain in qapi. Since legacy previously always rejected
> 'hubport', we can now make that explicit by having the two unions be
> slightly different; but that means we must manually map between the
> two structures.
I suspect this explains most of the differences between the sed script's
results and the actual patch. Would it be possible to split the patch
into a mechanical and a manual part, for easier review? If not, could
explain your manual edits in more detail?
> Signed-off-by: Eric Blake <address@hidden>
[...]
> index 8e79b55..490007c 100644
> --- a/hw/net/e1000.c
> +++ b/hw/net/e1000.c
> @@ -1785,7 +1785,7 @@ pci_e1000_uninit(PCIDevice *dev)
> }
>
> static NetClientInfo net_e1000_info = {
> - .type = NET_CLIENT_OPTIONS_KIND_NIC,
> + .type = NET_CLIENT_DRIVER_NIC,
> .size = sizeof(NICState),
> .can_receive = e1000_can_receive,
> .receive = e1000_receive,
I additionally get:
diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
index 692283f..825f0ba 100644
--- a/hw/net/e1000e.c
+++ b/hw/net/e1000e.c
@@ -226,7 +226,7 @@ e1000e_set_link_status(NetClientState *nc)
}
static NetClientInfo net_e1000e_info = {
- .type = NET_CLIENT_OPTIONS_KIND_NIC,
+ .type = NET_CLIENT_DRIVER_NIC,
.size = sizeof(NICState),
.can_receive = e1000e_nc_can_receive,
.receive = e1000e_nc_receive,
Rebase needed?
> index f8a500f..89a149b 100644
> --- a/net/dump.c
> +++ b/net/dump.c
> @@ -172,7 +172,7 @@ static void dumpclient_cleanup(NetClientState *nc)
> }
>
> static NetClientInfo net_dump_info = {
> - .type = NET_CLIENT_OPTIONS_KIND_DUMP,
> + .type = NET_CLIENT_DRIVER_DUMP,
> .size = sizeof(DumpNetClient),
> .receive = dumpclient_receive,
> .receive_iov = dumpclient_receive_iov,
> @@ -189,8 +189,8 @@ int net_init_dump(const Netdev *netdev, const char *name,
> NetClientState *nc;
> DumpNetClient *dnc;
>
> - assert(netdev->opts->type == NET_CLIENT_OPTIONS_KIND_DUMP);
> - dump = netdev->opts->u.dump.data;
> + assert(netdev->type == NET_CLIENT_DRIVER_DUMP);
> + dump = &netdev->u.dump;
sed turns this into
dump = netdev->u.dump.data;
Is this part of the manual changes? More of the same below.
>
> assert(peer);
>
Another possible case of "rebase needed":
diff --git a/net/filter.c b/net/filter.c
index 8ac79f3..888fe6d 100644
--- a/net/filter.c
+++ b/net/filter.c
@@ -201,7 +201,7 @@ static void netfilter_complete(UserCreatable *uc, Error
**errp)
}
queues = qemu_find_net_clients_except(nf->netdev_id, ncs,
- NET_CLIENT_OPTIONS_KIND_NIC,
+ NET_CLIENT_DRIVER_NIC,
MAX_QUEUE_NUM);
if (queues < 1) {
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "netdev",
> diff --git a/net/hub.c b/net/hub.c
> index ec4626f..32d8cf5 100644
> --- a/net/hub.c
> +++ b/net/hub.c
> @@ -131,7 +131,7 @@ static void net_hub_port_cleanup(NetClientState *nc)
> }
>
> static NetClientInfo net_hub_port_info = {
> - .type = NET_CLIENT_OPTIONS_KIND_HUBPORT,
> + .type = NET_CLIENT_DRIVER_HUBPORT,
> .size = sizeof(NetHubPort),
> .can_receive = net_hub_port_can_receive,
> .receive = net_hub_port_receive,
> @@ -266,10 +266,10 @@ int net_hub_id_for_client(NetClientState *nc, int *id)
> {
> NetHubPort *port;
>
> - if (nc->info->type == NET_CLIENT_OPTIONS_KIND_HUBPORT) {
> + if (nc->info->type == NET_CLIENT_DRIVER_HUBPORT) {
> port = DO_UPCAST(NetHubPort, nc, nc);
> } else if (nc->peer != NULL && nc->peer->info->type ==
> - NET_CLIENT_OPTIONS_KIND_HUBPORT) {
> + NET_CLIENT_DRIVER_HUBPORT) {
> port = DO_UPCAST(NetHubPort, nc, nc->peer);
> } else {
> return -ENOENT;
> @@ -286,9 +286,9 @@ int net_init_hubport(const Netdev *netdev, const char
> *name,
> {
> const NetdevHubPortOptions *hubport;
>
> - assert(netdev->opts->type == NET_CLIENT_OPTIONS_KIND_HUBPORT);
> + assert(netdev->type == NET_CLIENT_DRIVER_HUBPORT);
> assert(!peer);
> - hubport = netdev->opts->u.hubport.data;
> + hubport = &netdev->u.hubport;
sed:
+ hubport = netdev->u.hubport.data;
>
> net_hub_add_port(hubport->hubid, name);
> return 0;
> @@ -315,14 +315,14 @@ void net_hub_check_clients(void)
> }
>
> switch (peer->info->type) {
> - case NET_CLIENT_OPTIONS_KIND_NIC:
> + case NET_CLIENT_DRIVER_NIC:
> has_nic = 1;
> break;
> - case NET_CLIENT_OPTIONS_KIND_USER:
> - case NET_CLIENT_OPTIONS_KIND_TAP:
> - case NET_CLIENT_OPTIONS_KIND_SOCKET:
> - case NET_CLIENT_OPTIONS_KIND_VDE:
> - case NET_CLIENT_OPTIONS_KIND_VHOST_USER:
> + case NET_CLIENT_DRIVER_USER:
> + case NET_CLIENT_DRIVER_TAP:
> + case NET_CLIENT_DRIVER_SOCKET:
> + case NET_CLIENT_DRIVER_VDE:
> + case NET_CLIENT_DRIVER_VHOST_USER:
> has_host_dev = 1;
> break;
> default:
> diff --git a/net/l2tpv3.c b/net/l2tpv3.c
> index df02f5b..6745b78 100644
> --- a/net/l2tpv3.c
> +++ b/net/l2tpv3.c
> @@ -516,7 +516,7 @@ static void net_l2tpv3_cleanup(NetClientState *nc)
> }
>
> static NetClientInfo net_l2tpv3_info = {
> - .type = NET_CLIENT_OPTIONS_KIND_L2TPV3,
> + .type = NET_CLIENT_DRIVER_L2TPV3,
> .size = sizeof(NetL2TPV3State),
> .receive = net_l2tpv3_receive_dgram,
> .receive_iov = net_l2tpv3_receive_dgram_iov,
> @@ -545,8 +545,8 @@ int net_init_l2tpv3(const Netdev *netdev,
> s->queue_tail = 0;
> s->header_mismatch = false;
>
> - assert(netdev->opts->type == NET_CLIENT_OPTIONS_KIND_L2TPV3);
> - l2tpv3 = netdev->opts->u.l2tpv3.data;
> + assert(netdev->type == NET_CLIENT_DRIVER_L2TPV3);
> + l2tpv3 = &netdev->u.l2tpv3;
sed:
+ l2tpv3 = netdev->u.l2tpv3.data;
>
> if (l2tpv3->has_ipv6 && l2tpv3->ipv6) {
> s->ipv6 = l2tpv3->ipv6;
> diff --git a/net/net.c b/net/net.c
> index ec4e700..c49a295 100644
> --- a/net/net.c
> +++ b/net/net.c
> @@ -291,7 +291,7 @@ NICState *qemu_new_nic(NetClientInfo *info,
> NICState *nic;
> int i, queues = MAX(1, conf->peers.queues);
>
> - assert(info->type == NET_CLIENT_OPTIONS_KIND_NIC);
> + assert(info->type == NET_CLIENT_DRIVER_NIC);
> assert(info->size >= sizeof(NICState));
>
> nic = g_malloc0(info->size + sizeof(NetClientState) * queues);
> @@ -362,13 +362,13 @@ void qemu_del_net_client(NetClientState *nc)
> int queues, i;
> NetFilterState *nf, *next;
>
> - assert(nc->info->type != NET_CLIENT_OPTIONS_KIND_NIC);
> + assert(nc->info->type != NET_CLIENT_DRIVER_NIC);
>
> /* If the NetClientState belongs to a multiqueue backend, we will change
> all
> * other NetClientStates also.
> */
> queues = qemu_find_net_clients_except(nc->name, ncs,
> - NET_CLIENT_OPTIONS_KIND_NIC,
> + NET_CLIENT_DRIVER_NIC,
> MAX_QUEUE_NUM);
> assert(queues != 0);
>
> @@ -377,7 +377,7 @@ void qemu_del_net_client(NetClientState *nc)
> }
>
> /* If there is a peer NIC, delete and cleanup client, but do not free. */
> - if (nc->peer && nc->peer->info->type == NET_CLIENT_OPTIONS_KIND_NIC) {
> + if (nc->peer && nc->peer->info->type == NET_CLIENT_DRIVER_NIC) {
> NICState *nic = qemu_get_nic(nc->peer);
> if (nic->peer_deleted) {
> return;
> @@ -433,7 +433,7 @@ void qemu_foreach_nic(qemu_nic_foreach func, void *opaque)
> NetClientState *nc;
>
> QTAILQ_FOREACH(nc, &net_clients, next) {
> - if (nc->info->type == NET_CLIENT_OPTIONS_KIND_NIC) {
> + if (nc->info->type == NET_CLIENT_DRIVER_NIC) {
> if (nc->queue_index == 0) {
> func(qemu_get_nic(nc), opaque);
> }
> @@ -605,7 +605,7 @@ void qemu_flush_or_purge_queued_packets(NetClientState
> *nc, bool purge)
> {
> nc->receive_disabled = 0;
>
> - if (nc->peer && nc->peer->info->type == NET_CLIENT_OPTIONS_KIND_HUBPORT)
> {
> + if (nc->peer && nc->peer->info->type == NET_CLIENT_DRIVER_HUBPORT) {
> if (net_hub_flush(nc->peer)) {
> qemu_notify_event();
> }
> @@ -779,7 +779,7 @@ NetClientState *qemu_find_netdev(const char *id)
> NetClientState *nc;
>
> QTAILQ_FOREACH(nc, &net_clients, next) {
> - if (nc->info->type == NET_CLIENT_OPTIONS_KIND_NIC)
> + if (nc->info->type == NET_CLIENT_DRIVER_NIC)
> continue;
> if (!strcmp(nc->name, id)) {
> return nc;
> @@ -790,7 +790,7 @@ NetClientState *qemu_find_netdev(const char *id)
> }
>
> int qemu_find_net_clients_except(const char *id, NetClientState **ncs,
> - NetClientOptionsKind type, int max)
> + NetClientDriver type, int max)
> {
> NetClientState *nc;
> int ret = 0;
> @@ -871,8 +871,8 @@ static int net_init_nic(const Netdev *netdev, const char
> *name,
> NICInfo *nd;
> const NetLegacyNicOptions *nic;
>
> - assert(netdev->opts->type == NET_CLIENT_OPTIONS_KIND_NIC);
> - nic = netdev->opts->u.nic.data;
> + assert(netdev->type == NET_CLIENT_DRIVER_NIC);
> + nic = &netdev->u.nic;
sed:
+ nic = netdev->u.nic.data;
>
> idx = nic_get_free_idx();
> if (idx == -1 || nb_nics >= MAX_NICS) {
> @@ -932,39 +932,38 @@ static int net_init_nic(const Netdev *netdev, const
> char *name,
> }
>
>
> -static int (* const net_client_init_fun[NET_CLIENT_OPTIONS_KIND__MAX])(
> +static int (* const net_client_init_fun[NET_CLIENT_DRIVER__MAX])(
> const Netdev *netdev,
> const char *name,
> NetClientState *peer, Error **errp) = {
> - [NET_CLIENT_OPTIONS_KIND_NIC] = net_init_nic,
> + [NET_CLIENT_DRIVER_NIC] = net_init_nic,
> #ifdef CONFIG_SLIRP
> - [NET_CLIENT_OPTIONS_KIND_USER] = net_init_slirp,
> + [NET_CLIENT_DRIVER_USER] = net_init_slirp,
> #endif
> - [NET_CLIENT_OPTIONS_KIND_TAP] = net_init_tap,
> - [NET_CLIENT_OPTIONS_KIND_SOCKET] = net_init_socket,
> + [NET_CLIENT_DRIVER_TAP] = net_init_tap,
> + [NET_CLIENT_DRIVER_SOCKET] = net_init_socket,
> #ifdef CONFIG_VDE
> - [NET_CLIENT_OPTIONS_KIND_VDE] = net_init_vde,
> + [NET_CLIENT_DRIVER_VDE] = net_init_vde,
> #endif
> #ifdef CONFIG_NETMAP
> - [NET_CLIENT_OPTIONS_KIND_NETMAP] = net_init_netmap,
> + [NET_CLIENT_DRIVER_NETMAP] = net_init_netmap,
> #endif
> - [NET_CLIENT_OPTIONS_KIND_DUMP] = net_init_dump,
> + [NET_CLIENT_DRIVER_DUMP] = net_init_dump,
> #ifdef CONFIG_NET_BRIDGE
> - [NET_CLIENT_OPTIONS_KIND_BRIDGE] = net_init_bridge,
> + [NET_CLIENT_DRIVER_BRIDGE] = net_init_bridge,
> #endif
> - [NET_CLIENT_OPTIONS_KIND_HUBPORT] = net_init_hubport,
> + [NET_CLIENT_DRIVER_HUBPORT] = net_init_hubport,
> #ifdef CONFIG_VHOST_NET_USED
> - [NET_CLIENT_OPTIONS_KIND_VHOST_USER] = net_init_vhost_user,
> + [NET_CLIENT_DRIVER_VHOST_USER] = net_init_vhost_user,
> #endif
> #ifdef CONFIG_L2TPV3
> - [NET_CLIENT_OPTIONS_KIND_L2TPV3] = net_init_l2tpv3,
> + [NET_CLIENT_DRIVER_L2TPV3] = net_init_l2tpv3,
> #endif
> };
>
>
> static int net_client_init1(const void *object, int is_netdev, Error **errp)
> {
Multiple differences in this function. Manual?
> - const NetClientOptions *opts;
> Netdev legacy = {0};
> const Netdev *netdev;
> const char *name;
> @@ -972,34 +971,72 @@ static int net_client_init1(const void *object, int
> is_netdev, Error **errp)
>
> if (is_netdev) {
> netdev = object;
> - opts = netdev->opts;
> name = netdev->id;
>
> - if (opts->type == NET_CLIENT_OPTIONS_KIND_DUMP ||
> - opts->type == NET_CLIENT_OPTIONS_KIND_NIC ||
> - !net_client_init_fun[opts->type]) {
> + if (netdev->type == NET_CLIENT_DRIVER_DUMP ||
> + netdev->type == NET_CLIENT_DRIVER_NIC ||
> + !net_client_init_fun[netdev->type]) {
> error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "type",
> "a netdev backend type");
> return -1;
> }
> } else {
> const NetLegacy *net = object;
> + const NetClientOptions *opts = net->opts;
> legacy.id = net->id;
> - opts = legacy.opts = net->opts;
> netdev = &legacy;
> /* missing optional values have been initialized to "all bits zero"
> */
> name = net->has_id ? net->id : net->name;
>
> - if (opts->type == NET_CLIENT_OPTIONS_KIND_NONE) {
> + /* Map the old options to the new flat type */
> + switch (opts->type) {
> + case NET_CLIENT_OPTIONS_KIND_NONE:
> return 0; /* nothing to do */
> - }
> - if (opts->type == NET_CLIENT_OPTIONS_KIND_HUBPORT) {
> - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "type",
> - "a net type");
> - return -1;
> + case NET_CLIENT_OPTIONS_KIND_NIC:
> + legacy.type = NET_CLIENT_DRIVER_NIC;
> + legacy.u.nic = *opts->u.nic.data;
> + break;
> + case NET_CLIENT_OPTIONS_KIND_USER:
> + legacy.type = NET_CLIENT_DRIVER_USER;
> + legacy.u.user = *opts->u.user.data;
> + break;
> + case NET_CLIENT_OPTIONS_KIND_TAP:
> + legacy.type = NET_CLIENT_DRIVER_TAP;
> + legacy.u.tap = *opts->u.tap.data;
> + break;
> + case NET_CLIENT_OPTIONS_KIND_L2TPV3:
> + legacy.type = NET_CLIENT_DRIVER_L2TPV3;
> + legacy.u.l2tpv3 = *opts->u.l2tpv3.data;
> + break;
> + case NET_CLIENT_OPTIONS_KIND_SOCKET:
> + legacy.type = NET_CLIENT_DRIVER_SOCKET;
> + legacy.u.socket = *opts->u.socket.data;
> + break;
> + case NET_CLIENT_OPTIONS_KIND_VDE:
> + legacy.type = NET_CLIENT_DRIVER_VDE;
> + legacy.u.vde = *opts->u.vde.data;
> + break;
> + case NET_CLIENT_OPTIONS_KIND_DUMP:
> + legacy.type = NET_CLIENT_DRIVER_DUMP;
> + legacy.u.dump = *opts->u.dump.data;
> + break;
> + case NET_CLIENT_OPTIONS_KIND_BRIDGE:
> + legacy.type = NET_CLIENT_DRIVER_BRIDGE;
> + legacy.u.bridge = *opts->u.bridge.data;
> + break;
> + case NET_CLIENT_OPTIONS_KIND_NETMAP:
> + legacy.type = NET_CLIENT_DRIVER_NETMAP;
> + legacy.u.netmap = *opts->u.netmap.data;
> + break;
> + case NET_CLIENT_OPTIONS_KIND_VHOST_USER:
> + legacy.type = NET_CLIENT_DRIVER_VHOST_USER;
> + legacy.u.vhost_user = *opts->u.vhost_user.data;
> + break;
> + default:
> + abort();
> }
>
> - if (!net_client_init_fun[opts->type]) {
> + if (!net_client_init_fun[netdev->type]) {
> error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "type",
> "a net backend type (maybe it is not compiled "
> "into this binary)");
> @@ -1007,17 +1044,17 @@ static int net_client_init1(const void *object, int
> is_netdev, Error **errp)
> }
>
> /* Do not add to a vlan if it's a nic with a netdev= parameter. */
> - if (opts->type != NET_CLIENT_OPTIONS_KIND_NIC ||
> + if (netdev->type != NET_CLIENT_DRIVER_NIC ||
> !opts->u.nic.data->has_netdev) {
> peer = net_hub_add_port(net->has_vlan ? net->vlan : 0, NULL);
> }
> }
>
> - if (net_client_init_fun[opts->type](netdev, name, peer, errp) < 0) {
> + if (net_client_init_fun[netdev->type](netdev, name, peer, errp) < 0) {
> /* FIXME drop when all init functions store an Error */
> if (errp && !*errp) {
> error_setg(errp, QERR_DEVICE_INIT_FAILED,
> - NetClientOptionsKind_lookup[opts->type]);
> + NetClientDriver_lookup[netdev->type]);
> }
> return -1;
> }
> @@ -1137,7 +1174,7 @@ void hmp_host_net_remove(Monitor *mon, const QDict
> *qdict)
> device, vlan_id);
> return;
> }
> - if (nc->info->type == NET_CLIENT_OPTIONS_KIND_NIC) {
> + if (nc->info->type == NET_CLIENT_DRIVER_NIC) {
> error_report("invalid host network device '%s'", device);
> return;
> }
> @@ -1228,7 +1265,7 @@ void print_net_client(Monitor *mon, NetClientState *nc)
>
> monitor_printf(mon, "%s: index=%d,type=%s,%s\n", nc->name,
> nc->queue_index,
> - NetClientOptionsKind_lookup[nc->info->type],
> + NetClientDriver_lookup[nc->info->type],
> nc->info_str);
> if (!QTAILQ_EMPTY(&nc->filters)) {
> monitor_printf(mon, "filters:\n");
> @@ -1258,7 +1295,7 @@ RxFilterInfoList *qmp_query_rx_filter(bool has_name,
> const char *name,
> }
>
> /* only query rx-filter information of NIC */
> - if (nc->info->type != NET_CLIENT_OPTIONS_KIND_NIC) {
> + if (nc->info->type != NET_CLIENT_DRIVER_NIC) {
> if (has_name) {
> error_setg(errp, "net client(%s) isn't a NIC", name);
> return NULL;
> @@ -1304,7 +1341,7 @@ RxFilterInfoList *qmp_query_rx_filter(bool has_name,
> const char *name,
> void hmp_info_network(Monitor *mon, const QDict *qdict)
> {
> NetClientState *nc, *peer;
> - NetClientOptionsKind type;
> + NetClientDriver type;
>
> net_hub_info(mon);
>
> @@ -1317,10 +1354,10 @@ void hmp_info_network(Monitor *mon, const QDict
> *qdict)
> continue;
> }
>
> - if (!peer || type == NET_CLIENT_OPTIONS_KIND_NIC) {
> + if (!peer || type == NET_CLIENT_DRIVER_NIC) {
> print_net_client(mon, nc);
> } /* else it's a netdev connected to a NIC, printed with the NIC */
> - if (peer && type == NET_CLIENT_OPTIONS_KIND_NIC) {
> + if (peer && type == NET_CLIENT_DRIVER_NIC) {
> monitor_printf(mon, " \\ ");
> print_net_client(mon, peer);
> }
> @@ -1334,7 +1371,7 @@ void qmp_set_link(const char *name, bool up, Error
> **errp)
> int queues, i;
>
> queues = qemu_find_net_clients_except(name, ncs,
> - NET_CLIENT_OPTIONS_KIND__MAX,
> + NET_CLIENT_DRIVER__MAX,
> MAX_QUEUE_NUM);
>
> if (queues == 0) {
> @@ -1361,7 +1398,7 @@ void qmp_set_link(const char *name, bool up, Error
> **errp)
> * multiple clients that can still communicate with each other in
> * disconnected mode. For now maintain this compatibility.
> */
> - if (nc->peer->info->type == NET_CLIENT_OPTIONS_KIND_NIC) {
> + if (nc->peer->info->type == NET_CLIENT_DRIVER_NIC) {
> for (i = 0; i < queues; i++) {
> ncs[i]->peer->link_down = !up;
> }
> @@ -1402,7 +1439,7 @@ void net_cleanup(void)
> */
> while (!QTAILQ_EMPTY(&net_clients)) {
> nc = QTAILQ_FIRST(&net_clients);
> - if (nc->info->type == NET_CLIENT_OPTIONS_KIND_NIC) {
> + if (nc->info->type == NET_CLIENT_DRIVER_NIC) {
> qemu_del_nic(qemu_get_nic(nc));
> } else {
> qemu_del_net_client(nc);
> @@ -1434,7 +1471,7 @@ void net_check_clients(void)
> QTAILQ_FOREACH(nc, &net_clients, next) {
> if (!nc->peer) {
> fprintf(stderr, "Warning: %s %s has no peer\n",
> - nc->info->type == NET_CLIENT_OPTIONS_KIND_NIC ?
> + nc->info->type == NET_CLIENT_DRIVER_NIC ?
> "nic" : "netdev", nc->name);
> }
> }
> diff --git a/net/netmap.c b/net/netmap.c
> index addeedd..aa2d34a 100644
> --- a/net/netmap.c
> +++ b/net/netmap.c
> @@ -401,7 +401,7 @@ static void netmap_set_offload(NetClientState *nc, int
> csum, int tso4, int tso6,
>
> /* NetClientInfo methods */
> static NetClientInfo net_netmap_info = {
> - .type = NET_CLIENT_OPTIONS_KIND_NETMAP,
> + .type = NET_CLIENT_DRIVER_NETMAP,
> .size = sizeof(NetmapState),
> .receive = netmap_receive,
> .receive_iov = netmap_receive_iov,
> @@ -422,7 +422,7 @@ static NetClientInfo net_netmap_info = {
> int net_init_netmap(const Netdev *netdev,
> const char *name, NetClientState *peer, Error **errp)
> {
> - const NetdevNetmapOptions *netmap_opts = netdev->opts->u.netmap.data;
> + const NetdevNetmapOptions *netmap_opts = &netdev->u.netmap;
sed:
+ const NetdevNetmapOptions *netmap_opts = netdev->u.netmap.data;
> struct nm_desc *nmd;
> NetClientState *nc;
> Error *err = NULL;
> diff --git a/net/slirp.c b/net/slirp.c
> index bb49629..5aafbf3 100644
> --- a/net/slirp.c
> +++ b/net/slirp.c
> @@ -128,7 +128,7 @@ static void net_slirp_cleanup(NetClientState *nc)
> }
>
> static NetClientInfo net_slirp_info = {
> - .type = NET_CLIENT_OPTIONS_KIND_USER,
> + .type = NET_CLIENT_DRIVER_USER,
> .size = sizeof(SlirpState),
> .receive = net_slirp_receive,
> .cleanup = net_slirp_cleanup,
> @@ -828,8 +828,8 @@ int net_init_slirp(const Netdev *netdev, const char *name,
> const char **dnssearch;
> bool ipv4 = true, ipv6 = true;
>
> - assert(netdev->opts->type == NET_CLIENT_OPTIONS_KIND_USER);
> - user = netdev->opts->u.user.data;
> + assert(netdev->type == NET_CLIENT_DRIVER_USER);
> + user = &netdev->u.user;
sed:
+ user = netdev->u.user.data;
>
> if ((user->has_ipv6 && user->ipv6 && !user->has_ipv4) ||
> (user->has_ipv4 && !user->ipv4)) {
> diff --git a/net/socket.c b/net/socket.c
> index d258352..b831afa 100644
> --- a/net/socket.c
> +++ b/net/socket.c
> @@ -346,7 +346,7 @@ static void net_socket_cleanup(NetClientState *nc)
> }
>
> static NetClientInfo net_dgram_socket_info = {
> - .type = NET_CLIENT_OPTIONS_KIND_SOCKET,
> + .type = NET_CLIENT_DRIVER_SOCKET,
> .size = sizeof(NetSocketState),
> .receive = net_socket_receive_dgram,
> .cleanup = net_socket_cleanup,
> @@ -429,7 +429,7 @@ static void net_socket_connect(void *opaque)
> }
>
> static NetClientInfo net_socket_info = {
> - .type = NET_CLIENT_OPTIONS_KIND_SOCKET,
> + .type = NET_CLIENT_DRIVER_SOCKET,
> .size = sizeof(NetSocketState),
> .receive = net_socket_receive,
> .cleanup = net_socket_cleanup,
> @@ -704,8 +704,8 @@ int net_init_socket(const Netdev *netdev, const char
> *name,
> Error *err = NULL;
> const NetdevSocketOptions *sock;
>
> - assert(netdev->opts->type == NET_CLIENT_OPTIONS_KIND_SOCKET);
> - sock = netdev->opts->u.socket.data;
> + assert(netdev->type == NET_CLIENT_DRIVER_SOCKET);
> + sock = &netdev->u.socket;
sed:
+ sock = netdev->u.socket.data;
>
> if (sock->has_fd + sock->has_listen + sock->has_connect +
> sock->has_mcast +
> sock->has_udp != 1) {
> diff --git a/net/tap-win32.c b/net/tap-win32.c
> index 0f23b19..729309d 100644
> --- a/net/tap-win32.c
> +++ b/net/tap-win32.c
> @@ -750,7 +750,7 @@ static void tap_set_vnet_hdr_len(NetClientState *nc, int
> len)
> }
>
> static NetClientInfo net_tap_win32_info = {
> - .type = NET_CLIENT_OPTIONS_KIND_TAP,
> + .type = NET_CLIENT_DRIVER_TAP,
> .size = sizeof(TAPState),
> .receive = tap_receive,
> .cleanup = tap_cleanup,
> @@ -794,8 +794,8 @@ int net_init_tap(const Netdev *netdev, const char *name,
> /* FIXME error_setg(errp, ...) on failure */
> const NetdevTapOptions *tap;
>
> - assert(netdev->opts->type == NET_CLIENT_OPTIONS_KIND_TAP);
> - tap = netdev->opts->u.tap.data;
> + assert(netdev->type == NET_CLIENT_DRIVER_TAP);
> + tap = netdev->u.tap;
sed:
+ tap = netdev->u.tap.data;
>
> if (!tap->has_ifname) {
> error_report("tap: no interface name");
> diff --git a/net/tap.c b/net/tap.c
> index 9531880..8844d90 100644
> --- a/net/tap.c
> +++ b/net/tap.c
> @@ -222,7 +222,7 @@ static bool tap_has_ufo(NetClientState *nc)
> {
> TAPState *s = DO_UPCAST(TAPState, nc, nc);
>
> - assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_TAP);
> + assert(nc->info->type == NET_CLIENT_DRIVER_TAP);
>
> return s->has_ufo;
> }
> @@ -231,7 +231,7 @@ static bool tap_has_vnet_hdr(NetClientState *nc)
> {
> TAPState *s = DO_UPCAST(TAPState, nc, nc);
>
> - assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_TAP);
> + assert(nc->info->type == NET_CLIENT_DRIVER_TAP);
>
> return !!s->host_vnet_hdr_len;
> }
> @@ -240,7 +240,7 @@ static bool tap_has_vnet_hdr_len(NetClientState *nc, int
> len)
> {
> TAPState *s = DO_UPCAST(TAPState, nc, nc);
>
> - assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_TAP);
> + assert(nc->info->type == NET_CLIENT_DRIVER_TAP);
>
> return !!tap_probe_vnet_hdr_len(s->fd, len);
> }
> @@ -249,7 +249,7 @@ static void tap_set_vnet_hdr_len(NetClientState *nc, int
> len)
> {
> TAPState *s = DO_UPCAST(TAPState, nc, nc);
>
> - assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_TAP);
> + assert(nc->info->type == NET_CLIENT_DRIVER_TAP);
> assert(len == sizeof(struct virtio_net_hdr_mrg_rxbuf) ||
> len == sizeof(struct virtio_net_hdr));
>
> @@ -261,7 +261,7 @@ static void tap_using_vnet_hdr(NetClientState *nc, bool
> using_vnet_hdr)
> {
> TAPState *s = DO_UPCAST(TAPState, nc, nc);
>
> - assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_TAP);
> + assert(nc->info->type == NET_CLIENT_DRIVER_TAP);
> assert(!!s->host_vnet_hdr_len == using_vnet_hdr);
>
> s->using_vnet_hdr = using_vnet_hdr;
> @@ -327,14 +327,14 @@ static void tap_poll(NetClientState *nc, bool enable)
> int tap_get_fd(NetClientState *nc)
> {
> TAPState *s = DO_UPCAST(TAPState, nc, nc);
> - assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_TAP);
> + assert(nc->info->type == NET_CLIENT_DRIVER_TAP);
> return s->fd;
> }
>
> /* fd support */
>
> static NetClientInfo net_tap_info = {
> - .type = NET_CLIENT_OPTIONS_KIND_TAP,
> + .type = NET_CLIENT_DRIVER_TAP,
> .size = sizeof(TAPState),
> .receive = tap_receive,
> .receive_raw = tap_receive_raw,
> @@ -566,8 +566,8 @@ int net_init_bridge(const Netdev *netdev, const char
> *name,
> TAPState *s;
> int fd, vnet_hdr;
>
> - assert(netdev->opts->type == NET_CLIENT_OPTIONS_KIND_BRIDGE);
> - bridge = netdev->opts->u.bridge.data;
> + assert(netdev->type == NET_CLIENT_DRIVER_BRIDGE);
> + bridge = &netdev->u.bridge;
sed:
+ bridge = netdev->u.bridge.data;
>
> helper = bridge->has_helper ? bridge->helper : DEFAULT_BRIDGE_HELPER;
> br = bridge->has_br ? bridge->br : DEFAULT_BRIDGE_INTERFACE;
> @@ -729,8 +729,8 @@ int net_init_tap(const Netdev *netdev, const char *name,
> const char *vhostfdname;
> char ifname[128];
>
> - assert(netdev->opts->type == NET_CLIENT_OPTIONS_KIND_TAP);
> - tap = netdev->opts->u.tap.data;
> + assert(netdev->type == NET_CLIENT_DRIVER_TAP);
> + tap = &netdev->u.tap;
sed:
+ tap = netdev->u.tap.data;
> queues = tap->has_queues ? tap->queues : 1;
> vhostfdname = tap->has_vhostfd ? tap->vhostfd : NULL;
>
> @@ -891,7 +891,7 @@ int net_init_tap(const Netdev *netdev, const char *name,
> VHostNetState *tap_get_vhost_net(NetClientState *nc)
> {
> TAPState *s = DO_UPCAST(TAPState, nc, nc);
> - assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_TAP);
> + assert(nc->info->type == NET_CLIENT_DRIVER_TAP);
> return s->vhost_net;
> }
>
> diff --git a/net/vde.c b/net/vde.c
> index 53cdbbf..b8725f8 100644
> --- a/net/vde.c
> +++ b/net/vde.c
> @@ -68,7 +68,7 @@ static void vde_cleanup(NetClientState *nc)
> }
>
> static NetClientInfo net_vde_info = {
> - .type = NET_CLIENT_OPTIONS_KIND_VDE,
> + .type = NET_CLIENT_DRIVER_VDE,
> .size = sizeof(VDEState),
> .receive = vde_receive,
> .cleanup = vde_cleanup,
> @@ -115,8 +115,8 @@ int net_init_vde(const Netdev *netdev, const char *name,
> /* FIXME error_setg(errp, ...) on failure */
> const NetdevVdeOptions *vde;
>
> - assert(netdev->opts->type == NET_CLIENT_OPTIONS_KIND_VDE);
> - vde = netdev->opts->u.vde.data;
> + assert(netdev->type == NET_CLIENT_DRIVER_VDE);
> + vde = netdev->u.vde;
sed:
+ vde = netdev->u.vde.data;
>
> /* missing optional values have been initialized to "all bits zero" */
> if (net_vde_init(peer, "vde", name, vde->sock, vde->port, vde->group,
> diff --git a/net/vhost-user.c b/net/vhost-user.c
> index 4607c7b..01b5453 100644
> --- a/net/vhost-user.c
> +++ b/net/vhost-user.c
> @@ -32,7 +32,7 @@ typedef struct VhostUserChardevProps {
> VHostNetState *vhost_user_get_vhost_net(NetClientState *nc)
> {
> VhostUserState *s = DO_UPCAST(VhostUserState, nc, nc);
> - assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_VHOST_USER);
> + assert(nc->info->type == NET_CLIENT_DRIVER_VHOST_USER);
> return s->vhost_net;
> }
>
> @@ -47,7 +47,7 @@ static void vhost_user_stop(int queues, NetClientState
> *ncs[])
> int i;
>
> for (i = 0; i < queues; i++) {
> - assert (ncs[i]->info->type == NET_CLIENT_OPTIONS_KIND_VHOST_USER);
> + assert(ncs[i]->info->type == NET_CLIENT_DRIVER_VHOST_USER);
Manual whitespace cleanup. Okay.
>
> s = DO_UPCAST(VhostUserState, nc, ncs[i]);
> if (!vhost_user_running(s)) {
> @@ -71,7 +71,7 @@ static int vhost_user_start(int queues, NetClientState
> *ncs[])
> options.backend_type = VHOST_BACKEND_TYPE_USER;
>
> for (i = 0; i < queues; i++) {
> - assert (ncs[i]->info->type == NET_CLIENT_OPTIONS_KIND_VHOST_USER);
> + assert(ncs[i]->info->type == NET_CLIENT_DRIVER_VHOST_USER);
Likewise.
>
> s = DO_UPCAST(VhostUserState, nc, ncs[i]);
> if (vhost_user_running(s)) {
> @@ -146,20 +146,20 @@ static void vhost_user_cleanup(NetClientState *nc)
>
> static bool vhost_user_has_vnet_hdr(NetClientState *nc)
> {
> - assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_VHOST_USER);
> + assert(nc->info->type == NET_CLIENT_DRIVER_VHOST_USER);
>
> return true;
> }
>
> static bool vhost_user_has_ufo(NetClientState *nc)
> {
> - assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_VHOST_USER);
> + assert(nc->info->type == NET_CLIENT_DRIVER_VHOST_USER);
>
> return true;
> }
>
> static NetClientInfo net_vhost_user_info = {
> - .type = NET_CLIENT_OPTIONS_KIND_VHOST_USER,
> + .type = NET_CLIENT_DRIVER_VHOST_USER,
> .size = sizeof(VhostUserState),
> .receive = vhost_user_receive,
> .cleanup = vhost_user_cleanup,
> @@ -176,7 +176,7 @@ static void net_vhost_user_event(void *opaque, int event)
> int queues;
>
> queues = qemu_find_net_clients_except(name, ncs,
> - NET_CLIENT_OPTIONS_KIND_NIC,
> + NET_CLIENT_DRIVER_NIC,
> MAX_QUEUE_NUM);
> assert(queues < MAX_QUEUE_NUM);
>
> @@ -305,8 +305,8 @@ int net_init_vhost_user(const Netdev *netdev, const char
> *name,
> const NetdevVhostUserOptions *vhost_user_opts;
> CharDriverState *chr;
>
> - assert(netdev->opts->type == NET_CLIENT_OPTIONS_KIND_VHOST_USER);
> - vhost_user_opts = netdev->opts->u.vhost_user.data;
> + assert(netdev->type == NET_CLIENT_DRIVER_VHOST_USER);
> + vhost_user_opts = &netdev->u.vhost_user;
sed:
+ vhost_user_opts = netdev->u.vhost_user.data;
>
> chr = net_vhost_parse_chardev(vhost_user_opts, errp);
> if (!chr) {
- Re: [Qemu-ppc] [Qemu-devel] [PATCH v7 11/15] qapi: Change Netdev into a flat union,
Markus Armbruster <=