ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

memory: Implement memory_region_get_ram_addr with mr->ram_block 

Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <1456813104-25902-4-git-send-email-famz@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Fam Zheng 2016-03-01 14:18:20 +08:00 committed by Paolo Bonzini
parent 0a75601853
commit 7ebb2745ac
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/exec/memory.h
View File

@ -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 * memory_region_get_ram_addr: Get the ram address associated with a memory
* region * 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) ram_addr_t memory_region_get_ram_addr(MemoryRegion *mr);
{
return mr->ram_addr;
}
uint64_t memory_region_get_alignment(const MemoryRegion *mr); uint64_t memory_region_get_alignment(const MemoryRegion *mr);
/** /**

5
memory.c
View File

@ -1640,6 +1640,11 @@ void *memory_region_get_ram_ptr(MemoryRegion *mr)
return ptr + offset; 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) void memory_region_ram_resize(MemoryRegion *mr, ram_addr_t newsize, Error **errp)
{ {
assert(mr->ram_addr != RAM_ADDR_INVALID); assert(mr->ram_addr != RAM_ADDR_INVALID);