diff options
| author | Eduardo Habkost | 2015-11-06 22:20:04 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2015-12-17 15:24:33 +0100 |
| commit | a29ac16632aec6065c72985b9f7eeb1ca6fbef4a (patch) | |
| tree | 29891f85b28638e1be02db1695e53dc3e0b726a8 /exec.c | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20151217-... (diff) | |
| download | qemu-a29ac16632aec6065c72985b9f7eeb1ca6fbef4a.tar.gz qemu-a29ac16632aec6065c72985b9f7eeb1ca6fbef4a.tar.xz 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.c | 19 |
1 files changed, 0 insertions, 19 deletions
@@ -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) { |
