[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 3/7] memory: Implement memory_region_get_ram_addr
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v2 3/7] memory: Implement memory_region_get_ram_addr with mr->ram_block |
Date: |
Tue, 1 Mar 2016 14:18:20 +0800 |
Signed-off-by: Fam Zheng <address@hidden>
---
include/exec/memory.h | 8 +-------
memory.c | 5 +++++
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/include/exec/memory.h b/include/exec/memory.h
index d5284c2..810d2c0 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -978,14 +978,8 @@ void memory_region_add_subregion_overlap(MemoryRegion *mr,
/**
* memory_region_get_ram_addr: Get the ram address associated with a memory
* region
- *
- * DO NOT USE THIS FUNCTION. This is a temporary workaround while the Xen
- * code is being reworked.
*/
-static inline ram_addr_t memory_region_get_ram_addr(MemoryRegion *mr)
-{
- return mr->ram_addr;
-}
+ram_addr_t memory_region_get_ram_addr(MemoryRegion *mr);
uint64_t memory_region_get_alignment(const MemoryRegion *mr);
/**
diff --git a/memory.c b/memory.c
index fe70075..b2b2216 100644
--- a/memory.c
+++ b/memory.c
@@ -1596,6 +1596,11 @@ void *memory_region_get_ram_ptr(MemoryRegion *mr)
return ptr + offset;
}
+ram_addr_t memory_region_get_ram_addr(MemoryRegion *mr)
+{
+ return mr->ram_block ? mr->ram_block->offset : RAM_ADDR_INVALID;
+}
+
void memory_region_ram_resize(MemoryRegion *mr, ram_addr_t newsize, Error
**errp)
{
assert(mr->ram_addr != RAM_ADDR_INVALID);
--
2.4.3
- [Qemu-devel] [PATCH v2 0/7] memory: Clean up MemoryRegion.ram_addr and optimize address_space_translate, Fam Zheng, 2016/03/01
- [Qemu-devel] [PATCH v2 1/7] exec: Return RAMBlock pointer from allocating functions, Fam Zheng, 2016/03/01
- [Qemu-devel] [PATCH v2 2/7] memory: Move assignment to ram_block to memory_region_init_*, Fam Zheng, 2016/03/01
- [Qemu-devel] [PATCH v2 3/7] memory: Implement memory_region_get_ram_addr with mr->ram_block,
Fam Zheng <=
- [Qemu-devel] [PATCH v2 4/7] memory: Drop MemoryRegion.ram_addr, Fam Zheng, 2016/03/01
- Re: [Qemu-devel] [PATCH] scripts: Fix dump-guest-memory.py for MemoryRegion.ram_block removal, Paolo Bonzini, 2016/03/07
- Re: [Qemu-devel] [PATCH] scripts: Fix dump-guest-memory.py for MemoryRegion.ram_block removal, Janosch Frank, 2016/03/07
- Re: [Qemu-devel] [PATCH] scripts: Fix dump-guest-memory.py for MemoryRegion.ram_block removal, Janosch Frank, 2016/03/08
- Re: [Qemu-devel] [PATCH] scripts: Fix dump-guest-memory.py for MemoryRegion.ram_block removal, Fam Zheng, 2016/03/08