summary refs log tree commit diff stats
path: root/exec.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 /exec.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 'exec.c')
-rw-r--r--exec.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/exec.c b/exec.c
index 0bf0a6e7eb..d12cd42f4c 100644
--- a/exec.c
+++ b/exec.c
@@ -1676,25 +1676,6 @@ ram_addr_t qemu_ram_alloc_resizeable(ram_addr_t size, ram_addr_t maxsz,
     return qemu_ram_alloc_internal(size, maxsz, resized, NULL, true, mr, errp);
 }
 
-void qemu_ram_free_from_ptr(ram_addr_t addr)
-{
-    RAMBlock *block;
-
-    qemu_mutex_lock_ramlist();
-    QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {
-        if (addr == block->offset) {
-            QLIST_REMOVE_RCU(block, next);
-            ram_list.mru_block = NULL;
-            /* Write list before version */
-            smp_wmb();
-            ram_list.version++;
-            g_free_rcu(block, rcu);
-            break;
-        }
-    }
-    qemu_mutex_unlock_ramlist();
-}
-
 static void reclaim_ramblock(RAMBlock *block)
 {
     if (block->flags & RAM_PREALLOC) {