[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 07/16] hw, net: "net_client_type" -> "NetClientO
|
From: |
Paolo Bonzini |
|
Subject: |
Re: [Qemu-devel] [PATCH 07/16] hw, net: "net_client_type" -> "NetClientOptionsKind" (qapi-generated) |
|
Date: |
Tue, 05 Jun 2012 22:41:14 +0200 |
|
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:12.0) Gecko/20120430 Thunderbird/12.0.1 |
Il 22/05/2012 12:45, Laszlo Ersek ha scritto:
> NET_CLIENT_TYPE_ -> NET_CLIENT_OPTIONS_KIND_
>
> Signed-off-by: Laszlo Ersek <address@hidden>
> ---
> net.h | 16 +-------------
> hw/cadence_gem.c | 2 +-
> hw/dp8393x.c | 2 +-
> hw/e1000.c | 2 +-
> hw/eepro100.c | 2 +-
> hw/etraxfs_eth.c | 2 +-
> hw/lan9118.c | 2 +-
> hw/lance.c | 2 +-
> hw/mcf_fec.c | 2 +-
> hw/milkymist-minimac2.c | 2 +-
> hw/mipsnet.c | 2 +-
> hw/musicpal.c | 2 +-
> hw/ne2000-isa.c | 2 +-
> hw/ne2000.c | 2 +-
> hw/opencores_eth.c | 2 +-
> hw/pcnet-pci.c | 2 +-
> hw/rtl8139.c | 2 +-
> hw/smc91c111.c | 2 +-
> hw/spapr_llan.c | 2 +-
> hw/stellaris_enet.c | 2 +-
> hw/usb/dev-network.c | 2 +-
> hw/vhost_net.c | 2 +-
> hw/virtio-net.c | 10 ++++----
> hw/xen_nic.c | 2 +-
> hw/xgmac.c | 2 +-
> hw/xilinx_axienet.c | 2 +-
> hw/xilinx_ethlite.c | 2 +-
> net.c | 50 +++++++++++++++++++++++-----------------------
> net/dump.c | 2 +-
> net/slirp.c | 2 +-
> net/socket.c | 4 +-
> net/tap-win32.c | 2 +-
> net/tap.c | 16 +++++++-------
> net/vde.c | 2 +-
> 34 files changed, 71 insertions(+), 83 deletions(-)
>
> diff --git a/net.h b/net.h
> index bdc2a06..b0b8c7a 100644
> --- a/net.h
> +++ b/net.h
> @@ -7,6 +7,7 @@
> #include "qemu-option.h"
> #include "net/queue.h"
> #include "vmstate.h"
> +#include "qapi-types.h"
>
> struct MACAddr {
> uint8_t a[6];
> @@ -29,19 +30,6 @@ typedef struct NICConf {
>
> /* VLANs support */
>
> -typedef enum {
> - NET_CLIENT_TYPE_NONE,
> - NET_CLIENT_TYPE_NIC,
> - NET_CLIENT_TYPE_USER,
> - NET_CLIENT_TYPE_TAP,
> - NET_CLIENT_TYPE_SOCKET,
> - NET_CLIENT_TYPE_VDE,
> - NET_CLIENT_TYPE_DUMP,
> - NET_CLIENT_TYPE_BRIDGE,
> -
> - NET_CLIENT_TYPE_MAX
> -} net_client_type;
> -
> typedef void (NetPoll)(VLANClientState *, bool enable);
> typedef int (NetCanReceive)(VLANClientState *);
> typedef ssize_t (NetReceive)(VLANClientState *, const uint8_t *, size_t);
> @@ -50,7 +38,7 @@ typedef void (NetCleanup) (VLANClientState *);
> typedef void (LinkStatusChanged)(VLANClientState *);
>
> typedef struct NetClientInfo {
> - net_client_type type;
> + NetClientOptionsKind type;
> size_t size;
> NetReceive *receive;
> NetReceive *receive_raw;
> diff --git a/hw/cadence_gem.c b/hw/cadence_gem.c
> index e2140ae..f184620 100644
> --- a/hw/cadence_gem.c
> +++ b/hw/cadence_gem.c
> @@ -1161,7 +1161,7 @@ static void gem_set_link(VLANClientState *nc)
> }
>
> static NetClientInfo net_gem_info = {
> - .type = NET_CLIENT_TYPE_NIC,
> + .type = NET_CLIENT_OPTIONS_KIND_NIC,
> .size = sizeof(NICState),
> .can_receive = gem_can_receive,
> .receive = gem_receive,
> diff --git a/hw/dp8393x.c b/hw/dp8393x.c
> index 017d074..756d630 100644
> --- a/hw/dp8393x.c
> +++ b/hw/dp8393x.c
> @@ -872,7 +872,7 @@ static void nic_cleanup(VLANClientState *nc)
> }
>
> static NetClientInfo net_dp83932_info = {
> - .type = NET_CLIENT_TYPE_NIC,
> + .type = NET_CLIENT_OPTIONS_KIND_NIC,
> .size = sizeof(NICState),
> .can_receive = nic_can_receive,
> .receive = nic_receive,
> diff --git a/hw/e1000.c b/hw/e1000.c
> index 4573f13..ad24298 100644
> --- a/hw/e1000.c
> +++ b/hw/e1000.c
> @@ -1206,7 +1206,7 @@ pci_e1000_uninit(PCIDevice *dev)
> }
>
> static NetClientInfo net_e1000_info = {
> - .type = NET_CLIENT_TYPE_NIC,
> + .type = NET_CLIENT_OPTIONS_KIND_NIC,
> .size = sizeof(NICState),
> .can_receive = e1000_can_receive,
> .receive = e1000_receive,
> diff --git a/hw/eepro100.c b/hw/eepro100.c
> index 6279ae3..f343685 100644
> --- a/hw/eepro100.c
> +++ b/hw/eepro100.c
> @@ -1845,7 +1845,7 @@ static int pci_nic_uninit(PCIDevice *pci_dev)
> }
>
> static NetClientInfo net_eepro100_info = {
> - .type = NET_CLIENT_TYPE_NIC,
> + .type = NET_CLIENT_OPTIONS_KIND_NIC,
> .size = sizeof(NICState),
> .can_receive = nic_can_receive,
> .receive = nic_receive,
> diff --git a/hw/etraxfs_eth.c b/hw/etraxfs_eth.c
> index 16a0637..45fb40c 100644
> --- a/hw/etraxfs_eth.c
> +++ b/hw/etraxfs_eth.c
> @@ -579,7 +579,7 @@ static void eth_cleanup(VLANClientState *nc)
> }
>
> static NetClientInfo net_etraxfs_info = {
> - .type = NET_CLIENT_TYPE_NIC,
> + .type = NET_CLIENT_OPTIONS_KIND_NIC,
> .size = sizeof(NICState),
> .can_receive = eth_can_receive,
> .receive = eth_receive,
> diff --git a/hw/lan9118.c b/hw/lan9118.c
> index 7b4fe87..40fb765 100644
> --- a/hw/lan9118.c
> +++ b/hw/lan9118.c
> @@ -1310,7 +1310,7 @@ static void lan9118_cleanup(VLANClientState *nc)
> }
>
> static NetClientInfo net_lan9118_info = {
> - .type = NET_CLIENT_TYPE_NIC,
> + .type = NET_CLIENT_OPTIONS_KIND_NIC,
> .size = sizeof(NICState),
> .can_receive = lan9118_can_receive,
> .receive = lan9118_receive,
> diff --git a/hw/lance.c b/hw/lance.c
> index ce3d46c..91c0e16 100644
> --- a/hw/lance.c
> +++ b/hw/lance.c
> @@ -93,7 +93,7 @@ static void lance_cleanup(VLANClientState *nc)
> }
>
> static NetClientInfo net_lance_info = {
> - .type = NET_CLIENT_TYPE_NIC,
> + .type = NET_CLIENT_OPTIONS_KIND_NIC,
> .size = sizeof(NICState),
> .can_receive = pcnet_can_receive,
> .receive = pcnet_receive,
> diff --git a/hw/mcf_fec.c b/hw/mcf_fec.c
> index ae37bef..4ab4ff5 100644
> --- a/hw/mcf_fec.c
> +++ b/hw/mcf_fec.c
> @@ -450,7 +450,7 @@ static void mcf_fec_cleanup(VLANClientState *nc)
> }
>
> static NetClientInfo net_mcf_fec_info = {
> - .type = NET_CLIENT_TYPE_NIC,
> + .type = NET_CLIENT_OPTIONS_KIND_NIC,
> .size = sizeof(NICState),
> .can_receive = mcf_fec_can_receive,
> .receive = mcf_fec_receive,
> diff --git a/hw/milkymist-minimac2.c b/hw/milkymist-minimac2.c
> index 70bf336..3924b83 100644
> --- a/hw/milkymist-minimac2.c
> +++ b/hw/milkymist-minimac2.c
> @@ -448,7 +448,7 @@ static void milkymist_minimac2_reset(DeviceState *d)
> }
>
> static NetClientInfo net_milkymist_minimac2_info = {
> - .type = NET_CLIENT_TYPE_NIC,
> + .type = NET_CLIENT_OPTIONS_KIND_NIC,
> .size = sizeof(NICState),
> .can_receive = minimac2_can_rx,
> .receive = minimac2_rx,
> diff --git a/hw/mipsnet.c b/hw/mipsnet.c
> index 3107246..3385be7 100644
> --- a/hw/mipsnet.c
> +++ b/hw/mipsnet.c
> @@ -217,7 +217,7 @@ static void mipsnet_cleanup(VLANClientState *nc)
> }
>
> static NetClientInfo net_mipsnet_info = {
> - .type = NET_CLIENT_TYPE_NIC,
> + .type = NET_CLIENT_OPTIONS_KIND_NIC,
> .size = sizeof(NICState),
> .can_receive = mipsnet_can_receive,
> .receive = mipsnet_receive,
> diff --git a/hw/musicpal.c b/hw/musicpal.c
> index c9f845a..80910cc 100644
> --- a/hw/musicpal.c
> +++ b/hw/musicpal.c
> @@ -374,7 +374,7 @@ static void eth_cleanup(VLANClientState *nc)
> }
>
> static NetClientInfo net_mv88w8618_info = {
> - .type = NET_CLIENT_TYPE_NIC,
> + .type = NET_CLIENT_OPTIONS_KIND_NIC,
> .size = sizeof(NICState),
> .can_receive = eth_can_receive,
> .receive = eth_receive,
> diff --git a/hw/ne2000-isa.c b/hw/ne2000-isa.c
> index a4a783a..99ed965 100644
> --- a/hw/ne2000-isa.c
> +++ b/hw/ne2000-isa.c
> @@ -44,7 +44,7 @@ static void isa_ne2000_cleanup(VLANClientState *nc)
> }
>
> static NetClientInfo net_ne2000_isa_info = {
> - .type = NET_CLIENT_TYPE_NIC,
> + .type = NET_CLIENT_OPTIONS_KIND_NIC,
> .size = sizeof(NICState),
> .can_receive = ne2000_can_receive,
> .receive = ne2000_receive,
> diff --git a/hw/ne2000.c b/hw/ne2000.c
> index d02e60c..760ed29 100644
> --- a/hw/ne2000.c
> +++ b/hw/ne2000.c
> @@ -711,7 +711,7 @@ static void ne2000_cleanup(VLANClientState *nc)
> }
>
> static NetClientInfo net_ne2000_info = {
> - .type = NET_CLIENT_TYPE_NIC,
> + .type = NET_CLIENT_OPTIONS_KIND_NIC,
> .size = sizeof(NICState),
> .can_receive = ne2000_can_receive,
> .receive = ne2000_receive,
> diff --git a/hw/opencores_eth.c b/hw/opencores_eth.c
> index 350f731..f4498d4 100644
> --- a/hw/opencores_eth.c
> +++ b/hw/opencores_eth.c
> @@ -467,7 +467,7 @@ static void open_eth_cleanup(VLANClientState *nc)
> }
>
> static NetClientInfo net_open_eth_info = {
> - .type = NET_CLIENT_TYPE_NIC,
> + .type = NET_CLIENT_OPTIONS_KIND_NIC,
> .size = sizeof(NICState),
> .can_receive = open_eth_can_receive,
> .receive = open_eth_receive,
> diff --git a/hw/pcnet-pci.c b/hw/pcnet-pci.c
> index 34d73aa..931fedd 100644
> --- a/hw/pcnet-pci.c
> +++ b/hw/pcnet-pci.c
> @@ -284,7 +284,7 @@ static int pci_pcnet_uninit(PCIDevice *dev)
> }
>
> static NetClientInfo net_pci_pcnet_info = {
> - .type = NET_CLIENT_TYPE_NIC,
> + .type = NET_CLIENT_OPTIONS_KIND_NIC,
> .size = sizeof(NICState),
> .can_receive = pcnet_can_receive,
> .receive = pcnet_receive,
> diff --git a/hw/rtl8139.c b/hw/rtl8139.c
> index eb22d04..aae2de4 100644
> --- a/hw/rtl8139.c
> +++ b/hw/rtl8139.c
> @@ -3453,7 +3453,7 @@ static int pci_rtl8139_uninit(PCIDevice *dev)
> }
>
> static NetClientInfo net_rtl8139_info = {
> - .type = NET_CLIENT_TYPE_NIC,
> + .type = NET_CLIENT_OPTIONS_KIND_NIC,
> .size = sizeof(NICState),
> .can_receive = rtl8139_can_receive,
> .receive = rtl8139_receive,
> diff --git a/hw/smc91c111.c b/hw/smc91c111.c
> index 1a5213f..451ede0 100644
> --- a/hw/smc91c111.c
> +++ b/hw/smc91c111.c
> @@ -736,7 +736,7 @@ static void smc91c111_cleanup(VLANClientState *nc)
> }
>
> static NetClientInfo net_smc91c111_info = {
> - .type = NET_CLIENT_TYPE_NIC,
> + .type = NET_CLIENT_OPTIONS_KIND_NIC,
> .size = sizeof(NICState),
> .can_receive = smc91c111_can_receive,
> .receive = smc91c111_receive,
> diff --git a/hw/spapr_llan.c b/hw/spapr_llan.c
> index 8313043..9a1ac4f 100644
> --- a/hw/spapr_llan.c
> +++ b/hw/spapr_llan.c
> @@ -176,7 +176,7 @@ static ssize_t spapr_vlan_receive(VLANClientState *nc,
> const uint8_t *buf,
> }
>
> static NetClientInfo net_spapr_vlan_info = {
> - .type = NET_CLIENT_TYPE_NIC,
> + .type = NET_CLIENT_OPTIONS_KIND_NIC,
> .size = sizeof(NICState),
> .can_receive = spapr_vlan_can_receive,
> .receive = spapr_vlan_receive,
> diff --git a/hw/stellaris_enet.c b/hw/stellaris_enet.c
> index fbe99cb..b593cd0 100644
> --- a/hw/stellaris_enet.c
> +++ b/hw/stellaris_enet.c
> @@ -393,7 +393,7 @@ static void stellaris_enet_cleanup(VLANClientState *nc)
> }
>
> static NetClientInfo net_stellaris_enet_info = {
> - .type = NET_CLIENT_TYPE_NIC,
> + .type = NET_CLIENT_OPTIONS_KIND_NIC,
> .size = sizeof(NICState),
> .can_receive = stellaris_enet_can_receive,
> .receive = stellaris_enet_receive,
> diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c
> index 5d2f098..f40c349 100644
> --- a/hw/usb/dev-network.c
> +++ b/hw/usb/dev-network.c
> @@ -1313,7 +1313,7 @@ static void usb_net_handle_destroy(USBDevice *dev)
> }
>
> static NetClientInfo net_usbnet_info = {
> - .type = NET_CLIENT_TYPE_NIC,
> + .type = NET_CLIENT_OPTIONS_KIND_NIC,
> .size = sizeof(NICState),
> .can_receive = usbnet_can_receive,
> .receive = usbnet_receive,
> diff --git a/hw/vhost_net.c b/hw/vhost_net.c
> index f672e9d..75f8211 100644
> --- a/hw/vhost_net.c
> +++ b/hw/vhost_net.c
> @@ -83,7 +83,7 @@ void vhost_net_ack_features(struct vhost_net *net, unsigned
> features)
> static int vhost_net_get_fd(VLANClientState *backend)
> {
> switch (backend->info->type) {
> - case NET_CLIENT_TYPE_TAP:
> + case NET_CLIENT_OPTIONS_KIND_TAP:
> return tap_get_fd(backend);
> default:
> fprintf(stderr, "vhost-net requires tap backend\n");
> diff --git a/hw/virtio-net.c b/hw/virtio-net.c
> index bc5e3a8..2bc672e 100644
> --- a/hw/virtio-net.c
> +++ b/hw/virtio-net.c
> @@ -108,7 +108,7 @@ static void virtio_net_vhost_status(VirtIONet *n, uint8_t
> status)
> if (!n->nic->nc.peer) {
> return;
> }
> - if (n->nic->nc.peer->info->type != NET_CLIENT_TYPE_TAP) {
> + if (n->nic->nc.peer->info->type != NET_CLIENT_OPTIONS_KIND_TAP) {
> return;
> }
>
> @@ -205,7 +205,7 @@ static int peer_has_vnet_hdr(VirtIONet *n)
> if (!n->nic->nc.peer)
> return 0;
>
> - if (n->nic->nc.peer->info->type != NET_CLIENT_TYPE_TAP)
> + if (n->nic->nc.peer->info->type != NET_CLIENT_OPTIONS_KIND_TAP)
> return 0;
>
> n->has_vnet_hdr = tap_has_vnet_hdr(n->nic->nc.peer);
> @@ -249,7 +249,7 @@ static uint32_t virtio_net_get_features(VirtIODevice
> *vdev, uint32_t features)
> }
>
> if (!n->nic->nc.peer ||
> - n->nic->nc.peer->info->type != NET_CLIENT_TYPE_TAP) {
> + n->nic->nc.peer->info->type != NET_CLIENT_OPTIONS_KIND_TAP) {
> return features;
> }
> if (!tap_get_vhost_net(n->nic->nc.peer)) {
> @@ -288,7 +288,7 @@ static void virtio_net_set_features(VirtIODevice *vdev,
> uint32_t features)
> (features >> VIRTIO_NET_F_GUEST_UFO) & 1);
> }
> if (!n->nic->nc.peer ||
> - n->nic->nc.peer->info->type != NET_CLIENT_TYPE_TAP) {
> + n->nic->nc.peer->info->type != NET_CLIENT_OPTIONS_KIND_TAP) {
> return;
> }
> if (!tap_get_vhost_net(n->nic->nc.peer)) {
> @@ -984,7 +984,7 @@ static void virtio_net_cleanup(VLANClientState *nc)
> }
>
> static NetClientInfo net_virtio_info = {
> - .type = NET_CLIENT_TYPE_NIC,
> + .type = NET_CLIENT_OPTIONS_KIND_NIC,
> .size = sizeof(NICState),
> .can_receive = virtio_net_can_receive,
> .receive = virtio_net_receive,
> diff --git a/hw/xen_nic.c b/hw/xen_nic.c
> index 9a59bda..3866743 100644
> --- a/hw/xen_nic.c
> +++ b/hw/xen_nic.c
> @@ -304,7 +304,7 @@ static ssize_t net_rx_packet(VLANClientState *nc, const
> uint8_t *buf, size_t siz
> /* ------------------------------------------------------------- */
>
> static NetClientInfo net_xen_info = {
> - .type = NET_CLIENT_TYPE_NIC,
> + .type = NET_CLIENT_OPTIONS_KIND_NIC,
> .size = sizeof(NICState),
> .can_receive = net_rx_ok,
> .receive = net_rx_packet,
> diff --git a/hw/xgmac.c b/hw/xgmac.c
> index dd4bdc4..e539681 100644
> --- a/hw/xgmac.c
> +++ b/hw/xgmac.c
> @@ -371,7 +371,7 @@ static void eth_cleanup(VLANClientState *nc)
> }
>
> static NetClientInfo net_xgmac_enet_info = {
> - .type = NET_CLIENT_TYPE_NIC,
> + .type = NET_CLIENT_OPTIONS_KIND_NIC,
> .size = sizeof(NICState),
> .can_receive = eth_can_rx,
> .receive = eth_rx,
> diff --git a/hw/xilinx_axienet.c b/hw/xilinx_axienet.c
> index 7526273..993a79f 100644
> --- a/hw/xilinx_axienet.c
> +++ b/hw/xilinx_axienet.c
> @@ -832,7 +832,7 @@ axienet_stream_push(void *opaque, uint8_t *buf, size_t
> size, uint32_t *hdr)
> }
>
> static NetClientInfo net_xilinx_enet_info = {
> - .type = NET_CLIENT_TYPE_NIC,
> + .type = NET_CLIENT_OPTIONS_KIND_NIC,
> .size = sizeof(NICState),
> .can_receive = eth_can_rx,
> .receive = eth_rx,
> diff --git a/hw/xilinx_ethlite.c b/hw/xilinx_ethlite.c
> index 857b33d..1560a20 100644
> --- a/hw/xilinx_ethlite.c
> +++ b/hw/xilinx_ethlite.c
> @@ -202,7 +202,7 @@ static void eth_cleanup(VLANClientState *nc)
> }
>
> static NetClientInfo net_xilinx_ethlite_info = {
> - .type = NET_CLIENT_TYPE_NIC,
> + .type = NET_CLIENT_OPTIONS_KIND_NIC,
> .size = sizeof(NICState),
> .can_receive = eth_can_rx,
> .receive = eth_rx,
> diff --git a/net.c b/net.c
> index 4aa416c..9c8cd42 100644
> --- a/net.c
> +++ b/net.c
> @@ -239,7 +239,7 @@ NICState *qemu_new_nic(NetClientInfo *info,
> VLANClientState *nc;
> NICState *nic;
>
> - assert(info->type == NET_CLIENT_TYPE_NIC);
> + assert(info->type == NET_CLIENT_OPTIONS_KIND_NIC);
> assert(info->size >= sizeof(NICState));
>
> nc = qemu_new_net_client(info, conf->vlan, conf->peer, model, name);
> @@ -282,7 +282,7 @@ static void qemu_free_vlan_client(VLANClientState *vc)
> void qemu_del_vlan_client(VLANClientState *vc)
> {
> /* If there is a peer NIC, delete and cleanup client, but do not free. */
> - if (!vc->vlan && vc->peer && vc->peer->info->type ==
> NET_CLIENT_TYPE_NIC) {
> + if (!vc->vlan && vc->peer && vc->peer->info->type ==
> NET_CLIENT_OPTIONS_KIND_NIC) {
> NICState *nic = DO_UPCAST(NICState, nc, vc->peer);
> if (nic->peer_deleted) {
> return;
> @@ -298,7 +298,7 @@ void qemu_del_vlan_client(VLANClientState *vc)
> }
>
> /* If this is a peer NIC and peer has already been deleted, free it now.
> */
> - if (!vc->vlan && vc->peer && vc->info->type == NET_CLIENT_TYPE_NIC) {
> + if (!vc->vlan && vc->peer && vc->info->type ==
> NET_CLIENT_OPTIONS_KIND_NIC) {
> NICState *nic = DO_UPCAST(NICState, nc, vc);
> if (nic->peer_deleted) {
> qemu_free_vlan_client(vc->peer);
> @@ -341,14 +341,14 @@ void qemu_foreach_nic(qemu_nic_foreach func, void
> *opaque)
> VLANState *vlan;
>
> QTAILQ_FOREACH(nc, &non_vlan_clients, next) {
> - if (nc->info->type == NET_CLIENT_TYPE_NIC) {
> + if (nc->info->type == NET_CLIENT_OPTIONS_KIND_NIC) {
> func(DO_UPCAST(NICState, nc, nc), opaque);
> }
> }
>
> QTAILQ_FOREACH(vlan, &vlans, next) {
> QTAILQ_FOREACH(nc, &vlan->clients, next) {
> - if (nc->info->type == NET_CLIENT_TYPE_NIC) {
> + if (nc->info->type == NET_CLIENT_OPTIONS_KIND_NIC) {
> func(DO_UPCAST(NICState, nc, nc), opaque);
> }
> }
> @@ -664,7 +664,7 @@ VLANClientState *qemu_find_netdev(const char *id)
> VLANClientState *vc;
>
> QTAILQ_FOREACH(vc, &non_vlan_clients, next) {
> - if (vc->info->type == NET_CLIENT_TYPE_NIC)
> + if (vc->info->type == NET_CLIENT_OPTIONS_KIND_NIC)
> continue;
> if (!strcmp(vc->name, id)) {
> return vc;
> @@ -828,15 +828,15 @@ static const struct {
> const char *type;
> net_client_init_func init;
> QemuOptDesc desc[NET_MAX_DESC];
> -} net_client_types[NET_CLIENT_TYPE_MAX] = {
> - [NET_CLIENT_TYPE_NONE] = {
> +} net_client_types[NET_CLIENT_OPTIONS_KIND_MAX] = {
> + [NET_CLIENT_OPTIONS_KIND_NONE] = {
> .type = "none",
> .desc = {
> NET_COMMON_PARAMS_DESC,
> { /* end of list */ }
> },
> },
> - [NET_CLIENT_TYPE_NIC] = {
> + [NET_CLIENT_OPTIONS_KIND_NIC] = {
> .type = "nic",
> .init = net_init_nic,
> .desc = {
> @@ -867,7 +867,7 @@ static const struct {
> },
> },
> #ifdef CONFIG_SLIRP
> - [NET_CLIENT_TYPE_USER] = {
> + [NET_CLIENT_OPTIONS_KIND_USER] = {
> .type = "user",
> .init = net_init_slirp,
> .desc = {
> @@ -929,7 +929,7 @@ static const struct {
> },
> },
> #endif
> - [NET_CLIENT_TYPE_TAP] = {
> + [NET_CLIENT_OPTIONS_KIND_TAP] = {
> .type = "tap",
> .init = net_init_tap,
> .desc = {
> @@ -983,7 +983,7 @@ static const struct {
> { /* end of list */ }
> },
> },
> - [NET_CLIENT_TYPE_SOCKET] = {
> + [NET_CLIENT_OPTIONS_KIND_SOCKET] = {
> .type = "socket",
> .init = net_init_socket,
> .desc = {
> @@ -1017,7 +1017,7 @@ static const struct {
> },
> },
> #ifdef CONFIG_VDE
> - [NET_CLIENT_TYPE_VDE] = {
> + [NET_CLIENT_OPTIONS_KIND_VDE] = {
> .type = "vde",
> .init = net_init_vde,
> .desc = {
> @@ -1043,7 +1043,7 @@ static const struct {
> },
> },
> #endif
> - [NET_CLIENT_TYPE_DUMP] = {
> + [NET_CLIENT_OPTIONS_KIND_DUMP] = {
> .type = "dump",
> .init = net_init_dump,
> .desc = {
> @@ -1061,7 +1061,7 @@ static const struct {
> },
> },
> #ifdef CONFIG_NET_BRIDGE
> - [NET_CLIENT_TYPE_BRIDGE] = {
> + [NET_CLIENT_OPTIONS_KIND_BRIDGE] = {
> .type = "bridge",
> .init = net_init_bridge,
> .desc = {
> @@ -1129,7 +1129,7 @@ int net_client_init(QemuOpts *opts, int is_netdev,
> Error **errp)
> name = qemu_opt_get(opts, "name");
> }
>
> - for (i = 0; i < NET_CLIENT_TYPE_MAX; i++) {
> + for (i = 0; i < NET_CLIENT_OPTIONS_KIND_MAX; i++) {
> if (net_client_types[i].type != NULL &&
> !strcmp(net_client_types[i].type, type)) {
> Error *local_err = NULL;
> @@ -1293,7 +1293,7 @@ void do_info_network(Monitor *mon)
> {
> VLANState *vlan;
> VLANClientState *vc, *peer;
> - net_client_type type;
> + NetClientOptionsKind type;
>
> QTAILQ_FOREACH(vlan, &vlans, next) {
> monitor_printf(mon, "VLAN %d devices:\n", vlan->id);
> @@ -1307,11 +1307,11 @@ void do_info_network(Monitor *mon)
> QTAILQ_FOREACH(vc, &non_vlan_clients, next) {
> peer = vc->peer;
> type = vc->info->type;
> - if (!peer || type == NET_CLIENT_TYPE_NIC) {
> + if (!peer || type == NET_CLIENT_OPTIONS_KIND_NIC) {
> monitor_printf(mon, " ");
> print_net_client(mon, vc);
> } /* else it's a netdev connected to a NIC, printed with the NIC */
> - if (peer && type == NET_CLIENT_TYPE_NIC) {
> + if (peer && type == NET_CLIENT_OPTIONS_KIND_NIC) {
> monitor_printf(mon, " \\ ");
> print_net_client(mon, peer);
> }
> @@ -1399,13 +1399,13 @@ void net_check_clients(void)
>
> QTAILQ_FOREACH(vc, &vlan->clients, next) {
> switch (vc->info->type) {
> - case NET_CLIENT_TYPE_NIC:
> + case NET_CLIENT_OPTIONS_KIND_NIC:
> has_nic = 1;
> break;
> - case NET_CLIENT_TYPE_USER:
> - case NET_CLIENT_TYPE_TAP:
> - case NET_CLIENT_TYPE_SOCKET:
> - case NET_CLIENT_TYPE_VDE:
> + case NET_CLIENT_OPTIONS_KIND_USER:
> + case NET_CLIENT_OPTIONS_KIND_TAP:
> + case NET_CLIENT_OPTIONS_KIND_SOCKET:
> + case NET_CLIENT_OPTIONS_KIND_VDE:
> has_host_dev = 1;
> break;
> default: ;
> @@ -1421,7 +1421,7 @@ void net_check_clients(void)
> QTAILQ_FOREACH(vc, &non_vlan_clients, next) {
> if (!vc->peer) {
> fprintf(stderr, "Warning: %s %s has no peer\n",
> - vc->info->type == NET_CLIENT_TYPE_NIC ? "nic" : "netdev",
> + vc->info->type == NET_CLIENT_OPTIONS_KIND_NIC ? "nic" :
> "netdev",
> vc->name);
> }
> }
> diff --git a/net/dump.c b/net/dump.c
> index f835c51..2124b9a 100644
> --- a/net/dump.c
> +++ b/net/dump.c
> @@ -93,7 +93,7 @@ static void dump_cleanup(VLANClientState *nc)
> }
>
> static NetClientInfo net_dump_info = {
> - .type = NET_CLIENT_TYPE_DUMP,
> + .type = NET_CLIENT_OPTIONS_KIND_DUMP,
> .size = sizeof(DumpState),
> .receive = dump_receive,
> .cleanup = dump_cleanup,
> diff --git a/net/slirp.c b/net/slirp.c
> index 37b6ccf..9076d99 100644
> --- a/net/slirp.c
> +++ b/net/slirp.c
> @@ -128,7 +128,7 @@ static void net_slirp_cleanup(VLANClientState *nc)
> }
>
> static NetClientInfo net_slirp_info = {
> - .type = NET_CLIENT_TYPE_USER,
> + .type = NET_CLIENT_OPTIONS_KIND_USER,
> .size = sizeof(SlirpState),
> .receive = net_slirp_receive,
> .cleanup = net_slirp_cleanup,
> diff --git a/net/socket.c b/net/socket.c
> index fcd0a3c..30536ef 100644
> --- a/net/socket.c
> +++ b/net/socket.c
> @@ -239,7 +239,7 @@ static void net_socket_cleanup(VLANClientState *nc)
> }
>
> static NetClientInfo net_dgram_socket_info = {
> - .type = NET_CLIENT_TYPE_SOCKET,
> + .type = NET_CLIENT_OPTIONS_KIND_SOCKET,
> .size = sizeof(NetSocketState),
> .receive = net_socket_receive_dgram,
> .cleanup = net_socket_cleanup,
> @@ -317,7 +317,7 @@ static void net_socket_connect(void *opaque)
> }
>
> static NetClientInfo net_socket_info = {
> - .type = NET_CLIENT_TYPE_SOCKET,
> + .type = NET_CLIENT_OPTIONS_KIND_SOCKET,
> .size = sizeof(NetSocketState),
> .receive = net_socket_receive,
> .cleanup = net_socket_cleanup,
> diff --git a/net/tap-win32.c b/net/tap-win32.c
> index a801a55..f7b6129 100644
> --- a/net/tap-win32.c
> +++ b/net/tap-win32.c
> @@ -667,7 +667,7 @@ static void tap_win32_send(void *opaque)
> }
>
> static NetClientInfo net_tap_win32_info = {
> - .type = NET_CLIENT_TYPE_TAP,
> + .type = NET_CLIENT_OPTIONS_KIND_TAP,
> .size = sizeof(TAPState),
> .receive = tap_receive,
> .cleanup = tap_cleanup,
> diff --git a/net/tap.c b/net/tap.c
> index 5ac4ba3..4cba566 100644
> --- a/net/tap.c
> +++ b/net/tap.c
> @@ -217,7 +217,7 @@ int tap_has_ufo(VLANClientState *nc)
> {
> TAPState *s = DO_UPCAST(TAPState, nc, nc);
>
> - assert(nc->info->type == NET_CLIENT_TYPE_TAP);
> + assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_TAP);
>
> return s->has_ufo;
> }
> @@ -226,7 +226,7 @@ int tap_has_vnet_hdr(VLANClientState *nc)
> {
> TAPState *s = DO_UPCAST(TAPState, nc, nc);
>
> - assert(nc->info->type == NET_CLIENT_TYPE_TAP);
> + assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_TAP);
>
> return !!s->host_vnet_hdr_len;
> }
> @@ -235,7 +235,7 @@ int tap_has_vnet_hdr_len(VLANClientState *nc, int len)
> {
> TAPState *s = DO_UPCAST(TAPState, nc, nc);
>
> - assert(nc->info->type == NET_CLIENT_TYPE_TAP);
> + assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_TAP);
>
> return tap_probe_vnet_hdr_len(s->fd, len);
> }
> @@ -244,7 +244,7 @@ void tap_set_vnet_hdr_len(VLANClientState *nc, int len)
> {
> TAPState *s = DO_UPCAST(TAPState, nc, nc);
>
> - assert(nc->info->type == NET_CLIENT_TYPE_TAP);
> + assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_TAP);
> assert(len == sizeof(struct virtio_net_hdr_mrg_rxbuf) ||
> len == sizeof(struct virtio_net_hdr));
>
> @@ -258,7 +258,7 @@ void tap_using_vnet_hdr(VLANClientState *nc, int
> using_vnet_hdr)
>
> using_vnet_hdr = using_vnet_hdr != 0;
>
> - assert(nc->info->type == NET_CLIENT_TYPE_TAP);
> + assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_TAP);
> assert(!!s->host_vnet_hdr_len == using_vnet_hdr);
>
> s->using_vnet_hdr = using_vnet_hdr;
> @@ -305,14 +305,14 @@ static void tap_poll(VLANClientState *nc, bool enable)
> int tap_get_fd(VLANClientState *nc)
> {
> TAPState *s = DO_UPCAST(TAPState, nc, nc);
> - assert(nc->info->type == NET_CLIENT_TYPE_TAP);
> + assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_TAP);
> return s->fd;
> }
>
> /* fd support */
>
> static NetClientInfo net_tap_info = {
> - .type = NET_CLIENT_TYPE_TAP,
> + .type = NET_CLIENT_OPTIONS_KIND_TAP,
> .size = sizeof(TAPState),
> .receive = tap_receive,
> .receive_raw = tap_receive_raw,
> @@ -710,6 +710,6 @@ int net_init_tap(QemuOpts *opts, const char *name,
> VLANState *vlan)
> VHostNetState *tap_get_vhost_net(VLANClientState *nc)
> {
> TAPState *s = DO_UPCAST(TAPState, nc, nc);
> - assert(nc->info->type == NET_CLIENT_TYPE_TAP);
> + assert(nc->info->type == NET_CLIENT_OPTIONS_KIND_TAP);
> return s->vhost_net;
> }
> diff --git a/net/vde.c b/net/vde.c
> index 6b9d452..0e8bf23 100644
> --- a/net/vde.c
> +++ b/net/vde.c
> @@ -69,7 +69,7 @@ static void vde_cleanup(VLANClientState *nc)
> }
>
> static NetClientInfo net_vde_info = {
> - .type = NET_CLIENT_TYPE_VDE,
> + .type = NET_CLIENT_OPTIONS_KIND_VDE,
> .size = sizeof(VDEState),
> .receive = vde_receive,
> .cleanup = vde_cleanup,
Reviewed-by: Paolo Bonzini <address@hidden>
Paolo
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [Qemu-devel] [PATCH 07/16] hw, net: "net_client_type" -> "NetClientOptionsKind" (qapi-generated),
Paolo Bonzini <=