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

net: intorduce qemu_del_nic()

Browse Source 
To support multiqueue nic, this patch separate the nic destructor from
qemu_del_net_client() to a new helper qemu_del_nic() since the mapping bettween
NiCState and NetClientState were not 1:1 in multiqueue. The following patches
would refactor this function to support multiqueue nic.

Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Jason Wang 2013-01-30 19:12:24 +08:00 committed by Anthony Liguori
parent cc1f0f4542
commit 948ecf219c
10 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/e1000.c
View File

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

2
hw/eepro100.c
View File

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

2
hw/ne2000.c
View File

@ -751,7 +751,7 @@ static void pci_ne2000_exit(PCIDevice *pci_dev)
NE2000State *s = &d->ne2000;
memory_region_destroy(&s->io);
qemu_del_net_client(qemu_get_queue(s->nic));
qemu_del_nic(s->nic);
}
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);
qemu_del_timer(d->state.poll_timer);
qemu_free_timer(d->state.poll_timer);
qemu_del_net_client(qemu_get_queue(d->state.nic));
qemu_del_nic(d->state.nic);
}
static NetClientInfo net_pci_pcnet_info = {

2
hw/rtl8139.c
View File

@ -3446,7 +3446,7 @@ static void pci_rtl8139_uninit(PCIDevice *dev)
}
qemu_del_timer(s->timer);
qemu_free_timer(s->timer);
qemu_del_net_client(qemu_get_queue(s->nic));
qemu_del_nic(s->nic);
}
static void rtl8139_set_link_status(NetClientState *nc)

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

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

2
hw/virtio-net.c
View File

@ -1157,6 +1157,6 @@ void virtio_net_exit(VirtIODevice *vdev)
qemu_bh_delete(n->tx_bh);
}
qemu_del_net_client(qemu_get_queue(n->nic));
qemu_del_nic(n->nic);
virtio_cleanup(&n->vdev);
}

2
hw/xen_nic.c
View File

@ -408,7 +408,7 @@ static void net_disconnect(struct XenDevice *xendev)
netdev->rxs = NULL;
}
if (netdev->nic) {
qemu_del_net_client(qemu_get_queue(netdev->nic));
qemu_del_nic(netdev->nic);
netdev->nic = NULL;
}
}

1
include/net/net.h
View File

@ -77,6 +77,7 @@ NICState *qemu_new_nic(NetClientInfo *info,
const char *model,
const char *name,
void *opaque);
void qemu_del_nic(NICState *nic);
NetClientState *qemu_get_queue(NICState *nic);
NICState *qemu_get_nic(NetClientState *nc);
void *qemu_get_nic_opaque(NetClientState *nc);

15
net/net.c
View File

@ -291,6 +291,15 @@ void qemu_del_net_client(NetClientState *nc)
return;
}
assert(nc->info->type != NET_CLIENT_OPTIONS_KIND_NIC);
qemu_cleanup_net_client(nc);
qemu_free_net_client(nc);
}
void qemu_del_nic(NICState *nic)
{
NetClientState *nc = qemu_get_queue(nic);
/* If this is a peer NIC and peer has already been deleted, free it now. */
if (nc->peer && nc->info->type == NET_CLIENT_OPTIONS_KIND_NIC) {
NICState *nic = qemu_get_nic(nc);
@ -931,7 +940,11 @@ void net_cleanup(void)
NetClientState *nc, *next_vc;
QTAILQ_FOREACH_SAFE(nc, &net_clients, next, next_vc) {
qemu_del_net_client(nc);
if (nc->info->type == NET_CLIENT_OPTIONS_KIND_NIC) {
qemu_del_nic(qemu_get_nic(nc));
} else {
qemu_del_net_client(nc);
}
}
}