[Qemu-devel] [PATCH] memory: Fix memory_region_get_ram_ptr for ROM devices

[Jan Kiszka]

On 2011-08-29 23:15, Avi Kivity wrote:
> On 08/29/2011 10:14 PM, Anthony Liguori wrote:
>>> OK, that was simple: It's still "pflash_cfi01/pflash_cfi02: convert to
>>> memory API".
>>
>>
>> Hrm, okay.  Avi, maybe drop that patch and submit a v3?
>>
> 
> Of course.  I'm sta^Wcontinuing to hate that pflash thing.

It's not always the pflash... :)

---8<---

From: Jan Kiszka <address@hidden>

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 <address@hidden>
---
 memory.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/memory.c b/memory.c
index eb31fa8..57f0fa4 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)
-- 
1.7.3.4