[Qemu-devel] [PATCH 18/39] e1000: use instance_finalize instead of exit

[Paolo Bonzini]

Signed-off-by: Paolo Bonzini <address@hidden>
---
 hw/net/e1000.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index e6f46f0..cad4fd6 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -1294,8 +1294,9 @@ e1000_cleanup(NetClientState *nc)
 }
 
 static void
-pci_e1000_uninit(PCIDevice *dev)
+pci_e1000_instance_finalize(Object *obj)
 {
+    PCIDevice *dev = PCI_DEVICE(obj);
     E1000State *d = DO_UPCAST(E1000State, dev, dev);
 
     qemu_del_timer(d->autoneg_timer);
@@ -1377,7 +1378,6 @@ static void e1000_class_init(ObjectClass *klass, void 
*data)
     PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
 
     k->init = pci_e1000_init;
-    k->exit = pci_e1000_uninit;
     k->romfile = "efi-e1000.rom";
     k->vendor_id = PCI_VENDOR_ID_INTEL;
     k->device_id = E1000_DEVID;
@@ -1394,6 +1394,7 @@ static const TypeInfo e1000_info = {
     .parent        = TYPE_PCI_DEVICE,
     .instance_size = sizeof(E1000State),
     .class_init    = e1000_class_init,
+    .instance_finalize = pci_e1000_instance_finalize,
 };
 
 static void e1000_register_types(void)
-- 
1.8.1.4