diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-01 13:55:58 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-01 13:55:58 -0500 |
commit | a952c570c865d5eae6c148716f2cb585a0d3a2ee (patch) | |
tree | ea00e6e5d9622182441726d7e9841275cc67221e | |
parent | e2a99ad3e174ab4c9d2320dcecd779230409829f (diff) | |
parent | 021d26d161bac89235eb79126996825221cf9f10 (diff) |
Merge remote-tracking branch 'qemu-kvm-tmp/memory/core' into staging
-rw-r--r-- | memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1063,7 +1063,7 @@ void *memory_region_get_ram_ptr(MemoryRegion *mr) assert(mr->terminates); - return qemu_get_ram_ptr(mr->ram_addr); + return qemu_get_ram_ptr(mr->ram_addr & TARGET_PAGE_MASK); } static void memory_region_update_coalesced_range(MemoryRegion *mr) |