[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 22/39] rtl8139: use instance_finalize instead of exi
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 22/39] rtl8139: use instance_finalize instead of exit |
Date: |
Tue, 4 Jun 2013 20:52:17 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/net/rtl8139.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
index 7993f9f..c1c4921 100644
--- a/hw/net/rtl8139.c
+++ b/hw/net/rtl8139.c
@@ -3437,8 +3437,9 @@ static void rtl8139_cleanup(NetClientState *nc)
s->nic = NULL;
}
-static void pci_rtl8139_uninit(PCIDevice *dev)
+static void pci_rtl8139_instance_finalize(Object *obj)
{
+ PCIDevice *dev = PCI_DEVICE(obj);
RTL8139State *s = DO_UPCAST(RTL8139State, dev, dev);
memory_region_destroy(&s->bar_io);
@@ -3532,7 +3533,6 @@ static void rtl8139_class_init(ObjectClass *klass, void
*data)
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
k->init = pci_rtl8139_init;
- k->exit = pci_rtl8139_uninit;
k->romfile = "efi-rtl8139.rom";
k->vendor_id = PCI_VENDOR_ID_REALTEK;
k->device_id = PCI_DEVICE_ID_REALTEK_8139;
@@ -3548,6 +3548,7 @@ static const TypeInfo rtl8139_info = {
.parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(RTL8139State),
.class_init = rtl8139_class_init,
+ .instance_finalize = pci_rtl8139_instance_finalize,
};
static void rtl8139_register_types(void)
--
1.8.1.4
- [Qemu-devel] [PATCH 12/39] cmd646: use instance_finalize instead of exit, (continued)
- [Qemu-devel] [PATCH 12/39] cmd646: use instance_finalize instead of exit, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 13/39] ide/piix: use instance_finalize instead of exit, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 14/39] ide/via: use instance_finalize instead of exit, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 15/39] ivshmem: split exit and instance_finalize, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 16/39] pci-testdev: use instance_finalize instead of exit, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 17/39] vfio: split exit and instance_finalize, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 18/39] e1000: use instance_finalize instead of exit, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 19/39] eepro100: use instance_finalize instead of exit, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 20/39] ne2000: use instance_finalize instead of exit, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 21/39] pcnet: use instance_finalize instead of exit, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 22/39] rtl8139: use instance_finalize instead of exit,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 23/39] vmxnet3: split exit and instance_finalize, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 24/39] shpc: split shpc_free out of shpc_cleanup, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 25/39] pci_bridge: split pci_bridge_free from pci_bridge_exitfn, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 26/39] pcie_aer: pcie_aer_exit really frees stuff, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 27/39] pci_bridge: split exit and instance_finalize, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 28/39] ioh4320: split exit and instance_finalize, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 29/39] xio3130-downstream: split exit and instance_finalize, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 30/39] xio3130-upstream: split exit and instance_finalize, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 31/39] pcie: do not recreate mmcfg I/O region, use an alias instead, Paolo Bonzini, 2013/06/04
- [Qemu-devel] [PATCH 32/39] esp: use instance_finalize instead of exit, Paolo Bonzini, 2013/06/04