summaryrefslogtreecommitdiff
path: root/hw/net
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2014-06-11 12:50:43 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2014-08-18 12:06:21 +0200
commit469b046ead0671932ff3af8d6f95045b19b186ef (patch)
tree2ea738741930efbd091bf7fc645ce785bd1ec7a1 /hw/net
parentd8d95814609e89e5438a3318a647ec322fc4ff16 (diff)
downloadqemu-469b046ead0671932ff3af8d6f95045b19b186ef.zip
memory: remove memory_region_destroy
The function is empty after the previous patch, so remove it. Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/net')
-rw-r--r--hw/net/e1000.c2
-rw-r--r--hw/net/eepro100.c3
-rw-r--r--hw/net/ne2000.c1
-rw-r--r--hw/net/pcnet-pci.c2
-rw-r--r--hw/net/rtl8139.c2
-rw-r--r--hw/net/stellaris_enet.c8
-rw-r--r--hw/net/vmxnet3.c4
7 files changed, 0 insertions, 22 deletions
diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index 0fc29a0ae3..21c38fa520 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -1496,8 +1496,6 @@ pci_e1000_uninit(PCIDevice *dev)
timer_free(d->autoneg_timer);
timer_del(d->mit_timer);
timer_free(d->mit_timer);
- memory_region_destroy(&d->mmio);
- memory_region_destroy(&d->io);
qemu_del_nic(d->nic);
}
diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c
index 3263e3fe90..3cd826accc 100644
--- a/hw/net/eepro100.c
+++ b/hw/net/eepro100.c
@@ -1843,9 +1843,6 @@ static void pci_nic_uninit(PCIDevice *pci_dev)
{
EEPRO100State *s = DO_UPCAST(EEPRO100State, dev, pci_dev);
- memory_region_destroy(&s->mmio_bar);
- memory_region_destroy(&s->io_bar);
- memory_region_destroy(&s->flash_bar);
vmstate_unregister(&pci_dev->qdev, s->vmstate, s);
eeprom93xx_free(&pci_dev->qdev, s->eeprom);
qemu_del_nic(s->nic);
diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c
index d558b8c677..a62d12d92d 100644
--- a/hw/net/ne2000.c
+++ b/hw/net/ne2000.c
@@ -748,7 +748,6 @@ static void pci_ne2000_exit(PCIDevice *pci_dev)
PCINE2000State *d = DO_UPCAST(PCINE2000State, dev, pci_dev);
NE2000State *s = &d->ne2000;
- memory_region_destroy(&s->io);
qemu_del_nic(s->nic);
qemu_free_irq(s->irq);
}
diff --git a/hw/net/pcnet-pci.c b/hw/net/pcnet-pci.c
index b25d789d2c..50ffe914e0 100644
--- a/hw/net/pcnet-pci.c
+++ b/hw/net/pcnet-pci.c
@@ -282,8 +282,6 @@ static void pci_pcnet_uninit(PCIDevice *dev)
PCIPCNetState *d = PCI_PCNET(dev);
qemu_free_irq(d->state.irq);
- memory_region_destroy(&d->state.mmio);
- memory_region_destroy(&d->io_bar);
timer_del(d->state.poll_timer);
timer_free(d->state.poll_timer);
qemu_del_nic(d->state.nic);
diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
index 90bc5ecdd3..6e59f3819b 100644
--- a/hw/net/rtl8139.c
+++ b/hw/net/rtl8139.c
@@ -3462,8 +3462,6 @@ static void pci_rtl8139_uninit(PCIDevice *dev)
{
RTL8139State *s = RTL8139(dev);
- memory_region_destroy(&s->bar_io);
- memory_region_destroy(&s->bar_mem);
if (s->cplus_txbuffer) {
g_free(s->cplus_txbuffer);
s->cplus_txbuffer = NULL;
diff --git a/hw/net/stellaris_enet.c b/hw/net/stellaris_enet.c
index c9ee5d3f10..c07e5137c2 100644
--- a/hw/net/stellaris_enet.c
+++ b/hw/net/stellaris_enet.c
@@ -485,13 +485,6 @@ static int stellaris_enet_init(SysBusDevice *sbd)
return 0;
}
-static void stellaris_enet_unrealize(DeviceState *dev, Error **errp)
-{
- stellaris_enet_state *s = STELLARIS_ENET(dev);
-
- memory_region_destroy(&s->mmio);
-}
-
static Property stellaris_enet_properties[] = {
DEFINE_NIC_PROPERTIES(stellaris_enet_state, conf),
DEFINE_PROP_END_OF_LIST(),
@@ -503,7 +496,6 @@ static void stellaris_enet_class_init(ObjectClass *klass, void *data)
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
k->init = stellaris_enet_init;
- dc->unrealize = stellaris_enet_unrealize;
dc->props = stellaris_enet_properties;
dc->vmsd = &vmstate_stellaris_enet;
}
diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
index 77bea6f89f..f11525cef2 100644
--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
@@ -2182,10 +2182,6 @@ static void vmxnet3_pci_uninit(PCIDevice *pci_dev)
vmxnet3_cleanup_msix(s);
vmxnet3_cleanup_msi(s);
-
- memory_region_destroy(&s->bar0);
- memory_region_destroy(&s->bar1);
- memory_region_destroy(&s->msix_bar);
}
static void vmxnet3_qdev_reset(DeviceState *dev)