[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/15] memory: Implement memory_region_get_ram_addr w
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 05/15] memory: Implement memory_region_get_ram_addr with mr->ram_block |
Date: |
Mon, 7 Mar 2016 18:36:51 +0100 |
From: Fam Zheng <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <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 1aa777d..d83405b 100644
--- a/memory.c
+++ b/memory.c
@@ -1640,6 +1640,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.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 <=
- [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, 2016/03/07
- [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