From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Mon, 29 Aug 2011 22:38:24 +0000 (+0200)
Subject: memory: Fix memory_region_get_ram_ptr for ROM devices
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=021d26d161bac89235eb79126996825221cf9f10;p=qemu.git

memory: Fix memory_region_get_ram_ptr for ROM devices

Mask out the sub-page bits that are used by ROM device for storing the
io-index and the IO_MEM_ROMD flag.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
---

diff --git a/memory.c b/memory.c
index eb31fa8e58..57f0fa44ff 100644
--- a/memory.c
+++ b/memory.c
@@ -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)