From: Avi Kivity <avi@redhat.com>
Date: Mon, 29 Aug 2011 06:12:49 +0000 (+0300)
Subject: memory: fix rom_device I/O mode
X-Git-Tag: v1.0-rc0~375^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5fe14cc7efa4e3ef58f591728e69203287a9de4;p=thirdparty%2Fqemu.git

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>
---

diff --git a/memory.c b/memory.c
index 1491a396ec9..eb31fa8e585 100644
--- a/memory.c
+++ b/memory.c
@@ -304,7 +304,7 @@ static void as_memory_range_add(AddressSpace *as, FlatRange *fr)
     }
 
     if (!fr->readable) {
-        phys_offset &= TARGET_PAGE_MASK;
+        phys_offset &= ~TARGET_PAGE_MASK & ~IO_MEM_ROMD;
     }
 
     cpu_register_physical_memory_log(fr->addr.start,