summary refs log tree commit diff stats
path: root/memory.c
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2015-11-06 19:20:04 -0200
committerPaolo Bonzini <pbonzini@redhat.com>2015-12-17 15:24:33 +0100
commita29ac16632aec6065c72985b9f7eeb1ca6fbef4a (patch)
tree29891f85b28638e1be02db1695e53dc3e0b726a8 /memory.c
parente5fbe28e5424d26fc2c25d0a7ecb927d3c80d5e8 (diff)
downloadfocaccia-qemu-a29ac16632aec6065c72985b9f7eeb1ca6fbef4a.tar.gz
focaccia-qemu-a29ac16632aec6065c72985b9f7eeb1ca6fbef4a.zip
exec: Eliminate qemu_ram_free_from_ptr()
Replace qemu_ram_free_from_ptr() with qemu_ram_free().

The only difference between qemu_ram_free_from_ptr() and
qemu_ram_free() is that g_free_rcu() is used instead of
call_rcu(reclaim_ramblock). We can safely replace it because:

* RAM blocks allocated by qemu_ram_alloc_from_ptr() always have
  RAM_PREALLOC set;
* reclaim_ramblock(block) will do nothing except g_free(block)
  if RAM_PREALLOC is set at block->flags.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <1446844805-14492-2-git-send-email-ehabkost@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'memory.c')
-rw-r--r--memory.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/memory.c b/memory.c
index e193658fc7..cf5b05f898 100644
--- a/memory.c
+++ b/memory.c
@@ -861,7 +861,7 @@ static void memory_region_destructor_ram(MemoryRegion *mr)
 
 static void memory_region_destructor_ram_from_ptr(MemoryRegion *mr)
 {
-    qemu_ram_free_from_ptr(mr->ram_addr);
+    qemu_ram_free(mr->ram_addr);
 }
 
 static void memory_region_destructor_rom_device(MemoryRegion *mr)