[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/15] exec: Pass RAMBlock pointer to qemu_ram_free
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 07/15] exec: Pass RAMBlock pointer to qemu_ram_free |
Date: |
Mon, 7 Mar 2016 18:36:53 +0100 |
From: Fam Zheng <address@hidden>
The only caller now knows exactly which RAMBlock to free, so it's not
necessary to do the lookup.
Reviewed-by: Gonglei <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
exec.c | 21 +++++++--------------
include/exec/ram_addr.h | 2 +-
memory.c | 4 ++--
3 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/exec.c b/exec.c
index 6ed4203..ad8b826 100644
--- a/exec.c
+++ b/exec.c
@@ -1751,22 +1751,15 @@ static void reclaim_ramblock(RAMBlock *block)
g_free(block);
}
-void qemu_ram_free(ram_addr_t addr)
+void qemu_ram_free(RAMBlock *block)
{
- 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++;
- call_rcu(block, reclaim_ramblock, rcu);
- break;
- }
- }
+ QLIST_REMOVE_RCU(block, next);
+ ram_list.mru_block = NULL;
+ /* Write list before version */
+ smp_wmb();
+ ram_list.version++;
+ call_rcu(block, reclaim_ramblock, rcu);
qemu_mutex_unlock_ramlist();
}
diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h
index 865e19b..5adf7a4 100644
--- a/include/exec/ram_addr.h
+++ b/include/exec/ram_addr.h
@@ -108,7 +108,7 @@ RAMBlock *qemu_ram_alloc_resizeable(ram_addr_t size,
ram_addr_t max_size,
int qemu_get_ram_fd(ram_addr_t addr);
void qemu_set_ram_fd(ram_addr_t addr, int fd);
void *qemu_get_ram_block_host_ptr(ram_addr_t addr);
-void qemu_ram_free(ram_addr_t addr);
+void qemu_ram_free(RAMBlock *block);
int qemu_ram_resize(ram_addr_t base, ram_addr_t newsize, Error **errp);
diff --git a/memory.c b/memory.c
index 5b5791c..9f5c458 100644
--- a/memory.c
+++ b/memory.c
@@ -902,12 +902,12 @@ static void memory_region_destructor_none(MemoryRegion
*mr)
static void memory_region_destructor_ram(MemoryRegion *mr)
{
- qemu_ram_free(memory_region_get_ram_addr(mr));
+ qemu_ram_free(mr->ram_block);
}
static void memory_region_destructor_rom_device(MemoryRegion *mr)
{
- qemu_ram_free(memory_region_get_ram_addr(mr) & TARGET_PAGE_MASK);
+ qemu_ram_free(mr->ram_block);
}
static bool memory_region_need_escape(char c)
--
2.5.0
- [Qemu-devel] [PULL 00/15] Memory changes and misc bug fixes for 2016-03-07, Paolo Bonzini, 2016/03/07
- [Qemu-devel] [PULL 01/15] log: do not log if QEMU is daemonized but without -D, Paolo Bonzini, 2016/03/07
- [Qemu-devel] [PULL 02/15] i8257: fix Terminal Count status, Paolo Bonzini, 2016/03/07
- [Qemu-devel] [PULL 03/15] exec: Return RAMBlock pointer from allocating functions, Paolo Bonzini, 2016/03/07
- [Qemu-devel] [PULL 04/15] memory: Move assignment to ram_block to memory_region_init_*, Paolo Bonzini, 2016/03/07
- [Qemu-devel] [PULL 05/15] memory: Implement memory_region_get_ram_addr with mr->ram_block, Paolo Bonzini, 2016/03/07
- [Qemu-devel] [PULL 06/15] memory: Drop MemoryRegion.ram_addr, Paolo Bonzini, 2016/03/07
- [Qemu-devel] [PULL 07/15] exec: Pass RAMBlock pointer to qemu_ram_free,
Paolo Bonzini <=
- [Qemu-devel] [PULL 08/15] exec: Factor out section_covers_addr, Paolo Bonzini, 2016/03/07
- [Qemu-devel] [PULL 11/15] doc/memory.txt: correct a logic error, Paolo Bonzini, 2016/03/07
- [Qemu-devel] [PULL 09/15] exec: Introduce AddressSpaceDispatch.mru_section, Paolo Bonzini, 2016/03/07
- [Qemu-devel] [PULL 12/15] doc/memory.txt: correct description of MemoryRegionOps fields, Paolo Bonzini, 2016/03/07
- [Qemu-devel] [PULL 13/15] MAINTAINERS: Add entry for include/sysemu/kvm*.h, Paolo Bonzini, 2016/03/07
- [Qemu-devel] [PULL 14/15] kvm/irqchip: use bitmap utility for gsi tracking, Paolo Bonzini, 2016/03/07
- [Qemu-devel] [PULL 15/15] scsi-bus: Remove tape command from scsi_req_xfer, Paolo Bonzini, 2016/03/07
- [Qemu-devel] [PULL 10/15] icount: possible options for sleep are on or off, Paolo Bonzini, 2016/03/07
- Re: [Qemu-devel] [PULL 00/15] Memory changes and misc bug fixes for 2016-03-07, Peter Maydell, 2016/03/08