diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-06-11 12:42:01 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-08-18 12:06:20 +0200 |
| commit | d8d95814609e89e5438a3318a647ec322fc4ff16 (patch) | |
| tree | a3f5cd4ff75d6488f0b00968cd7ed5c3a8df2c0b /hw/misc/omap_gpmc.c | |
| parent | e3fb0ade83420a86464ee50c71f2daf5641cab10 (diff) | |
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/misc/omap_gpmc.c')
| -rw-r--r-- | hw/misc/omap_gpmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/misc/omap_gpmc.c b/hw/misc/omap_gpmc.c index cddea241d4..fbbe2ff993 100644 --- a/hw/misc/omap_gpmc.c +++ b/hw/misc/omap_gpmc.c @@ -436,7 +436,7 @@ static void omap_gpmc_cs_unmap(struct omap_gpmc_s *s, int cs) } memory_region_del_subregion(get_system_memory(), &f->container); memory_region_del_subregion(&f->container, omap_gpmc_cs_memregion(s, cs)); - memory_region_destroy(&f->container); + object_unparent(OBJECT(&f->container)); } void omap_gpmc_reset(struct omap_gpmc_s *s) |