aboutsummaryrefslogtreecommitdiff
path: root/hw/mips
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2014-06-11 12:42:01 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2014-08-18 12:06:20 +0200
commitd8d95814609e89e5438a3318a647ec322fc4ff16 (patch)
treea3f5cd4ff75d6488f0b00968cd7ed5c3a8df2c0b /hw/mips
parente3fb0ade83420a86464ee50c71f2daf5641cab10 (diff)
downloadqemu-d8d95814609e89e5438a3318a647ec322fc4ff16.zip
qemu-d8d95814609e89e5438a3318a647ec322fc4ff16.tar.gz
qemu-d8d95814609e89e5438a3318a647ec322fc4ff16.tar.bz2
memory: convert memory_region_destroy to object_unparent
Explicitly call object_unparent in the few places where we will re-create the memory region. If the memory region is simply being destroyed as part of device teardown, let QOM handle it. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/mips')
-rw-r--r--hw/mips/gt64xxx_pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c
index 22f63ce..1f2fe5f 100644
--- a/hw/mips/gt64xxx_pci.c
+++ b/hw/mips/gt64xxx_pci.c
@@ -297,7 +297,7 @@ static void gt64120_pci_mapping(GT64120State *s)
if (s->PCI0IO_length)
{
memory_region_del_subregion(get_system_memory(), &s->PCI0IO_mem);
- memory_region_destroy(&s->PCI0IO_mem);
+ object_unparent(OBJECT(&s->PCI0IO_mem));
}
/* Map new IO address */
s->PCI0IO_start = s->regs[GT_PCI0IOLD] << 21;