Received: from eggs.gnu.org ([2001:4830:134:3::10]:38900) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VeBxb-0007OH-GU for qemu-devel@nongnu.org; Wed, 06 Nov 2013 17:52:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VeBxV-0001N1-Hb for qemu-devel@nongnu.org; Wed, 06 Nov 2013 17:52:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38688) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VeBxV-0001Mq-9Q for qemu-devel@nongnu.org; Wed, 06 Nov 2013 17:52:21 -0500 From: Bandan Das Date: Wed, 06 Nov 2013 17:52:17 -0500 Message-ID: MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH] pci: unregister vmstate_pcibus on unplug List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Andreas =?utf-8?Q?F=C3=A4rber?= , Michael Tsirkin PCIBus registers a vmstate during init. Unregister it upon removal/unplug. Signed-off-by: Bandan Das --- Note that I didn't add a instance_init to register vmstate (yet) due to concerns expressed by Andreas that we shouldn't be registering global state there. hw/pci/pci.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index a98c8a0..63ef7ce 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, }; @@ -401,6 +403,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); -- 1.8.3.1