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/display | |
| parent | e3fb0ade83420a86464ee50c71f2daf5641cab10 (diff) | |
| download | qemu-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/display')
| -rw-r--r-- | hw/display/vga.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/display/vga.c b/hw/display/vga.c index 68cfee2..65dab8d 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -176,7 +176,7 @@ static void vga_update_memory_access(VGACommonState *s) if (s->has_chain4_alias) { memory_region_del_subregion(s->legacy_address_space, &s->chain4_alias); - memory_region_destroy(&s->chain4_alias); + object_unparent(OBJECT(&s->chain4_alias)); s->has_chain4_alias = false; s->plane_updated = 0xf; } |