commit b5fe14cc7efa4e3ef58f591728e69203287a9de4
author Avi Kivity <avi@redhat.com> Mon Aug 29 09:12:49 2011 +0300
committer Avi Kivity <avi@redhat.com> Mon Aug 29 11:52:09 2011 +0300
tree b935b9b4b5031423b499b7c7c249177eee3e43f8
parent 75f5941cb583712b37a557ce61b95eeba91f520e

memory: fix rom_device I/O mode

When adding a rom_device in I/O mode, we incorrectly masked off the low
bits, resulting in a pure RAM map.  Fix my masking off the high bits and
IO_MEM_ROMD, yielding a pure I/O map.

Signed-off-by: Avi Kivity <avi@redhat.com>

memory.c

diff --git a/memory.c b/memory.c
index 1491a39..eb31fa8 100644
--- a/memory.c
+++ b/memory.c
@@ -304,7 +304,7 @@
     }
 
     if (!fr->readable) {
-        phys_offset &= TARGET_PAGE_MASK;
+        phys_offset &= ~TARGET_PAGE_MASK & ~IO_MEM_ROMD;
     }
 
     cpu_register_physical_memory_log(fr->addr.start,