From 5c397242d5d53c1adecce31817bb439383cf8228 Mon Sep 17 00:00:00 2001 From: Bandan Das Date: Wed, 6 Nov 2013 17:52:17 -0500 Subject: pci: unregister vmstate_pcibus on unplug MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PCIBus registers a vmstate during init. Unregister it upon removal/unplug. Signed-off-by: Bandan Das Cc: qemu-stable@nongnu.org Reviewed-by: Andreas Färber Signed-off-by: Michael S. Tsirkin --- hw/pci/pci.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'hw/pci') diff --git a/hw/pci/pci.c b/hw/pci/pci.c index ed32059bf8..49eca955aa 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -47,6 +47,7 @@ static void pcibus_dev_print(Monitor *mon, DeviceState *dev, int indent); static char *pcibus_get_dev_path(DeviceState *dev); static char *pcibus_get_fw_dev_path(DeviceState *dev); static int pcibus_reset(BusState *qbus); +static void pci_bus_finalize(Object *obj); static Property pci_props[] = { DEFINE_PROP_PCI_DEVFN("addr", PCIDevice, devfn, -1), @@ -73,6 +74,7 @@ static const TypeInfo pci_bus_info = { .name = TYPE_PCI_BUS, .parent = TYPE_BUS, .instance_size = sizeof(PCIBus), + .instance_finalize = pci_bus_finalize, .class_init = pci_bus_class_init, }; @@ -375,6 +377,12 @@ int pci_bus_num(PCIBus *s) return s->parent_dev->config[PCI_SECONDARY_BUS]; } +static void pci_bus_finalize(Object *obj) +{ + PCIBus *bus = PCI_BUS(obj); + vmstate_unregister(NULL, &vmstate_pcibus, bus); +} + static int get_pci_config_device(QEMUFile *f, void *pv, size_t size) { PCIDevice *s = container_of(pv, PCIDevice, config); -- cgit v1.2.1