OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

net: Rename qemu_del_vlan_client() to qemu_del_net_client()

Browse Source 
Another step in moving the vlan feature out of net core.  Users only
deal with NetClientState and therefore qemu_del_vlan_client() should be
named qemu_del_net_client().

Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Zhi Yong Wu <wuzhy@linux.vnet.ibm.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2012-07-24 16:35:15 +01:00
parent 35277d14ec
commit b20c6b9e47
11 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/e1000.c
View File

@ -1201,7 +1201,7 @@ pci_e1000_uninit(PCIDevice *dev)
qemu_free_timer(d->autoneg_timer); qemu_free_timer(d->autoneg_timer);
memory_region_destroy(&d->mmio); memory_region_destroy(&d->mmio);
memory_region_destroy(&d->io); memory_region_destroy(&d->io);
qemu_del_vlan_client(&d->nic->nc); qemu_del_net_client(&d->nic->nc);
} }
static NetClientInfo net_e1000_info = { static NetClientInfo net_e1000_info = {

2
hw/eepro100.c
View File

@ -1847,7 +1847,7 @@ static void pci_nic_uninit(PCIDevice *pci_dev)
memory_region_destroy(&s->flash_bar); memory_region_destroy(&s->flash_bar);
vmstate_unregister(&pci_dev->qdev, s->vmstate, s); vmstate_unregister(&pci_dev->qdev, s->vmstate, s);
eeprom93xx_free(&pci_dev->qdev, s->eeprom); eeprom93xx_free(&pci_dev->qdev, s->eeprom);
qemu_del_vlan_client(&s->nic->nc); qemu_del_net_client(&s->nic->nc);
} }
static NetClientInfo net_eepro100_info = { static NetClientInfo net_eepro100_info = {

2
hw/ne2000.c
View File

@ -750,7 +750,7 @@ static void pci_ne2000_exit(PCIDevice *pci_dev)
NE2000State *s = &d->ne2000; NE2000State *s = &d->ne2000;
memory_region_destroy(&s->io); memory_region_destroy(&s->io);
qemu_del_vlan_client(&s->nic->nc); qemu_del_net_client(&s->nic->nc);
} }
static Property ne2000_properties[] = { static Property ne2000_properties[] = {

2
hw/pcnet-pci.c
View File

@ -279,7 +279,7 @@ static void pci_pcnet_uninit(PCIDevice *dev)
memory_region_destroy(&d->io_bar); memory_region_destroy(&d->io_bar);
qemu_del_timer(d->state.poll_timer); qemu_del_timer(d->state.poll_timer);
qemu_free_timer(d->state.poll_timer); qemu_free_timer(d->state.poll_timer);
qemu_del_vlan_client(&d->state.nic->nc); qemu_del_net_client(&d->state.nic->nc);
} }
static NetClientInfo net_pci_pcnet_info = { static NetClientInfo net_pci_pcnet_info = {

2
hw/rtl8139.c
View File

@ -3450,7 +3450,7 @@ static void pci_rtl8139_uninit(PCIDevice *dev)
} }
qemu_del_timer(s->timer); qemu_del_timer(s->timer);
qemu_free_timer(s->timer); qemu_free_timer(s->timer);
qemu_del_vlan_client(&s->nic->nc); qemu_del_net_client(&s->nic->nc);
} }
static NetClientInfo net_rtl8139_info = { static NetClientInfo net_rtl8139_info = {

2
hw/usb/dev-network.c
View File

@ -1309,7 +1309,7 @@ static void usb_net_handle_destroy(USBDevice *dev)
/* TODO: remove the nd_table[] entry */ /* TODO: remove the nd_table[] entry */
rndis_clear_responsequeue(s); rndis_clear_responsequeue(s);
qemu_del_vlan_client(&s->nic->nc); qemu_del_net_client(&s->nic->nc);
} }
static NetClientInfo net_usbnet_info = { static NetClientInfo net_usbnet_info = {

2
hw/virtio-net.c
View File

@ -1077,6 +1077,6 @@ void virtio_net_exit(VirtIODevice *vdev)
qemu_bh_delete(n->tx_bh); qemu_bh_delete(n->tx_bh);
} }
qemu_del_vlan_client(&n->nic->nc); qemu_del_net_client(&n->nic->nc);
virtio_cleanup(&n->vdev); virtio_cleanup(&n->vdev);
} }

2
hw/xen_nic.c
View File

@ -406,7 +406,7 @@ static void net_disconnect(struct XenDevice *xendev)
netdev->rxs = NULL; netdev->rxs = NULL;
} }
if (netdev->nic) { if (netdev->nic) {
qemu_del_vlan_client(&netdev->nic->nc); qemu_del_net_client(&netdev->nic->nc);
netdev->nic = NULL; netdev->nic = NULL;
} }
} }

20
net.c
View File

@ -249,7 +249,7 @@ NICState *qemu_new_nic(NetClientInfo *info,
return nic; return nic;
} }
static void qemu_cleanup_vlan_client(NetClientState *nc) static void qemu_cleanup_net_client(NetClientState *nc)
{ {
QTAILQ_REMOVE(&net_clients, nc, next); QTAILQ_REMOVE(&net_clients, nc, next);
@ -258,7 +258,7 @@ static void qemu_cleanup_vlan_client(NetClientState *nc)
} }
} }
static void qemu_free_vlan_client(NetClientState *nc) static void qemu_free_net_client(NetClientState *nc)
{ {
if (nc->send_queue) { if (nc->send_queue) {
qemu_del_net_queue(nc->send_queue); qemu_del_net_queue(nc->send_queue);
@ -271,7 +271,7 @@ static void qemu_free_vlan_client(NetClientState *nc)
g_free(nc); g_free(nc);
} }
void qemu_del_vlan_client(NetClientState *nc) void qemu_del_net_client(NetClientState *nc)
{ {
/* If there is a peer NIC, delete and cleanup client, but do not free. */ /* 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_OPTIONS_KIND_NIC) {
@ -285,7 +285,7 @@ void qemu_del_vlan_client(NetClientState *nc)
if (nc->peer->info->link_status_changed) { if (nc->peer->info->link_status_changed) {
nc->peer->info->link_status_changed(nc->peer); nc->peer->info->link_status_changed(nc->peer);
} }
qemu_cleanup_vlan_client(nc); qemu_cleanup_net_client(nc);
return; return;
} }
@ -293,12 +293,12 @@ void qemu_del_vlan_client(NetClientState *nc)
if (nc->peer && nc->info->type == NET_CLIENT_OPTIONS_KIND_NIC) { if (nc->peer && nc->info->type == NET_CLIENT_OPTIONS_KIND_NIC) {
NICState *nic = DO_UPCAST(NICState, nc, nc); NICState *nic = DO_UPCAST(NICState, nc, nc);
if (nic->peer_deleted) { if (nic->peer_deleted) {
qemu_free_vlan_client(nc->peer); qemu_free_net_client(nc->peer);
} }
} }
qemu_cleanup_vlan_client(nc); qemu_cleanup_net_client(nc);
qemu_free_vlan_client(nc); qemu_free_net_client(nc);
} }
void qemu_foreach_nic(qemu_nic_foreach func, void *opaque) void qemu_foreach_nic(qemu_nic_foreach func, void *opaque)
@ -803,7 +803,7 @@ void net_host_device_remove(Monitor *mon, const QDict *qdict)
monitor_printf(mon, "invalid host network device %s\n", device); monitor_printf(mon, "invalid host network device %s\n", device);
return; return;
} }
qemu_del_vlan_client(nc); qemu_del_net_client(nc);
} }
void netdev_add(QemuOpts *opts, Error **errp) void netdev_add(QemuOpts *opts, Error **errp)
@ -851,7 +851,7 @@ void qmp_netdev_del(const char *id, Error **errp)
return; return;
} }
qemu_del_vlan_client(nc); qemu_del_net_client(nc);
qemu_opts_del(qemu_opts_find(qemu_find_opts_err("netdev", errp), id)); qemu_opts_del(qemu_opts_find(qemu_find_opts_err("netdev", errp), id));
} }
@ -920,7 +920,7 @@ void net_cleanup(void)
NetClientState *nc, *next_vc; NetClientState *nc, *next_vc;
QTAILQ_FOREACH_SAFE(nc, &net_clients, next, next_vc) { QTAILQ_FOREACH_SAFE(nc, &net_clients, next, next_vc) {
qemu_del_vlan_client(nc); qemu_del_net_client(nc);
} }
} }

2
net.h
View File

@ -77,7 +77,7 @@ NICState *qemu_new_nic(NetClientInfo *info,
const char *model, const char *model,
const char *name, const char *name,
void *opaque); void *opaque);
void qemu_del_vlan_client(NetClientState *nc); void qemu_del_net_client(NetClientState *nc);
NetClientState *qemu_find_vlan_client_by_name(Monitor *mon, int vlan_id, NetClientState *qemu_find_vlan_client_by_name(Monitor *mon, int vlan_id,
const char *client_str); const char *client_str);
typedef void (*qemu_nic_foreach)(NICState *nic, void *opaque); typedef void (*qemu_nic_foreach)(NICState *nic, void *opaque);

2
net/slirp.c
View File

@ -275,7 +275,7 @@ static int net_slirp_init(NetClientState *peer, const char *model,
return 0; return 0;
error: error:
qemu_del_vlan_client(nc); qemu_del_net_client(nc);
return -1; return -1;
} }