From a36a344dcd5c778cc0417df36c5aa8f95c5497c3 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Fri, 25 Sep 2009 21:42:37 +0200 Subject: pci: use qdev for device destruction. pci_unregister_device is static now and hooked into Devicestate->exit. qdev_free(pci_device) works now. Signed-off-by: Gerd Hoffmann Signed-off-by: Anthony Liguori --- hw/pci-hotplug.c | 2 +- hw/pci.c | 5 +++-- hw/pci.h | 2 -- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c index 89974a066..7e39bddd6 100644 --- a/hw/pci-hotplug.c +++ b/hw/pci-hotplug.c @@ -251,6 +251,6 @@ void pci_device_hot_remove_success(int pcibus, int slot) break; } - pci_unregister_device(d); + qdev_free(&d->qdev); } diff --git a/hw/pci.c b/hw/pci.c index eb8d0f113..0c7d7ec48 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -399,8 +399,9 @@ static void pci_unregister_io_regions(PCIDevice *pci_dev) } } -int pci_unregister_device(PCIDevice *pci_dev) +static int pci_unregister_device(DeviceState *dev) { + PCIDevice *pci_dev = DO_UPCAST(PCIDevice, qdev, dev); int ret = 0; if (pci_dev->unregister) @@ -412,7 +413,6 @@ int pci_unregister_device(PCIDevice *pci_dev) qemu_free_irqs(pci_dev->irq); pci_dev->bus->devices[pci_dev->devfn] = NULL; - qdev_free(&pci_dev->qdev); return 0; } @@ -956,6 +956,7 @@ static int pci_qdev_init(DeviceState *qdev, DeviceInfo *base) void pci_qdev_register(PCIDeviceInfo *info) { info->qdev.init = pci_qdev_init; + info->qdev.exit = pci_unregister_device; info->qdev.bus_info = &pci_bus_info; qdev_register(&info->qdev); } diff --git a/hw/pci.h b/hw/pci.h index c5c8c570d..9233b5bba 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -185,7 +185,6 @@ struct PCIDevice { /* do not access the following fields */ PCIConfigReadFunc *config_read; PCIConfigWriteFunc *config_write; - PCIUnregisterFunc *unregister; /* IRQ objects for the INTA-INTD pins. */ qemu_irq *irq; @@ -224,7 +223,6 @@ PCIDevice *pci_register_device(PCIBus *bus, const char *name, int instance_size, int devfn, PCIConfigReadFunc *config_read, PCIConfigWriteFunc *config_write); -int pci_unregister_device(PCIDevice *pci_dev); void pci_register_bar(PCIDevice *pci_dev, int region_num, uint32_t size, int type, -- cgit v1.2.3