Commit 948ecf21 authored by Jason Wang's avatar Jason Wang Committed by Anthony Liguori
Browse files

net: intorduce qemu_del_nic() 



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: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent cc1f0f45

hw/e1000.c

+1 −1
Original line number Diff line number Diff line
@@ -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 = {

hw/eepro100.c

+1 −1
Original line number Diff line number Diff line
@@ -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 = {

hw/ne2000.c

+1 −1
Original line number Diff line number Diff line
@@ -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[] = {

hw/pcnet-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -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 = {

hw/rtl8139.c

+1 −1
Original line number Diff line number Diff line
@@ -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)