Signed-off-by: Liu Ping Fan <pingf...@linux.vnet.ibm.com> --- hw/acpi_piix4.c | 2 +- hw/pci.c | 13 ++++++++++++- hw/pci.h | 1 + 3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index 15275cf..b45a016 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -306,7 +306,7 @@ static void acpi_piix_eject_slot(PIIX4PMState *s, unsigned slots) if (pc->no_hotplug) { slot_free = false; } else { - qdev_free(qdev); + qdev_unplug_complete(qdev, NULL); } } } diff --git a/hw/pci.c b/hw/pci.c index 7eeaac0..9ba589e 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -869,7 +869,6 @@ static int pci_unregister_device(DeviceState *dev) PCIDevice *pci_dev = PCI_DEVICE(dev); PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(pci_dev); - pci_unregister_io_regions(pci_dev); pci_del_option_rom(pci_dev); if (pc->exit) { @@ -880,6 +879,17 @@ static int pci_unregister_device(DeviceState *dev) return 0; } +static void pci_unmap_device(DeviceState *dev) +{ + PCIDevice *pci_dev = PCI_DEVICE(dev); + PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(pci_dev); + + pci_unregister_io_regions(pci_dev); + if (pc->unmap) { + pc->unmap(pci_dev); + } +} + void pci_register_bar(PCIDevice *pci_dev, int region_num, uint8_t type, MemoryRegion *memory) { @@ -2105,6 +2115,7 @@ static void pci_device_class_init(ObjectClass *klass, void *data) DeviceClass *k = DEVICE_CLASS(klass); k->init = pci_qdev_init; k->unplug = pci_unplug_device; + k->unmap = pci_unmap_device; k->exit = pci_unregister_device; k->bus_type = TYPE_PCI_BUS; k->props = pci_props; diff --git a/hw/pci.h b/hw/pci.h index 1f902f5..898cc5e 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -154,6 +154,7 @@ typedef struct PCIDeviceClass { DeviceClass parent_class; int (*init)(PCIDevice *dev); + void (*unmap)(PCIDevice *dev); PCIUnregisterFunc *exit; PCIConfigReadFunc *config_read; PCIConfigWriteFunc *config_write; -- 1.7.4.4