From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34506) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XK89U-0008JV-JO for qemu-devel@nongnu.org; Wed, 20 Aug 2014 11:50:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XK89M-0007xx-O8 for qemu-devel@nongnu.org; Wed, 20 Aug 2014 11:50:20 -0400 Received: from mail-wi0-x234.google.com ([2a00:1450:400c:c05::234]:65276) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XK89M-0007wl-BV for qemu-devel@nongnu.org; Wed, 20 Aug 2014 11:50:12 -0400 Received: by mail-wi0-f180.google.com with SMTP id n3so7158461wiv.13 for ; Wed, 20 Aug 2014 08:50:11 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 20 Aug 2014 17:50:05 +0200 Message-Id: <1408549805-20956-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH] pci_bridge: manually destroy memory regions within PCIBridgeWindows List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, arei.gonglei@huawei.com, knut.omang@oracle.com, mst@redhat.com The regions are destroyed and recreated on configuration space accesses. We need to destroy them before the containing PCIBridgeWindows object is freed. Reported-by: Gonglei Reported-by: Knut Omang Signed-off-by: Paolo Bonzini --- hw/pci/pci_bridge.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c index 1307265..40c97b1 100644 --- a/hw/pci/pci_bridge.c +++ b/hw/pci/pci_bridge.c @@ -219,6 +219,12 @@ static void pci_bridge_region_del(PCIBridge *br, PCIBridgeWindows *w) static void pci_bridge_region_cleanup(PCIBridge *br, PCIBridgeWindows *w) { + object_unparent(OBJECT(&w->alias_io)); + object_unparent(OBJECT(&w->alias_mem)); + object_unparent(OBJECT(&w->alias_pref_mem)); + object_unparent(OBJECT(&w->alias_vga[QEMU_PCI_VGA_IO_LO])); + object_unparent(OBJECT(&w->alias_vga[QEMU_PCI_VGA_IO_HI])); + object_unparent(OBJECT(&w->alias_vga[QEMU_PCI_VGA_MEM])); g_free(w); } -- 1.8.3.1