From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 3 May 2013 15:18:36 +0000 (+0200)
Subject: memory: do not duplicate memory_region_destructor_none
X-Git-Tag: qemu-xen-4.4.0-rc1~6^2~368^2~6
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=5553e3a5c95f4a842489384a2fafb27d7555a4ef;p=qemu-upstream-4.5-testing.git

memory: do not duplicate memory_region_destructor_none

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/memory.c b/memory.c
index 013464b10..54314636e 100644
--- a/memory.c
+++ b/memory.c
@@ -768,10 +768,6 @@ static void memory_region_destructor_ram_from_ptr(MemoryRegion *mr)
     qemu_ram_free_from_ptr(mr->ram_addr);
 }
 
-static void memory_region_destructor_iomem(MemoryRegion *mr)
-{
-}
-
 static void memory_region_destructor_rom_device(MemoryRegion *mr)
 {
     qemu_ram_free(mr->ram_addr & TARGET_PAGE_MASK);
@@ -929,7 +925,6 @@ void memory_region_init_io(MemoryRegion *mr,
     mr->ops = ops;
     mr->opaque = opaque;
     mr->terminates = true;
-    mr->destructor = memory_region_destructor_iomem;
     mr->ram_addr = ~(ram_addr_t)0;
 }