]> Git Repo - qemu.git/commitdiff
exec: limit system memory size
authorMichael S. Tsirkin <[email protected]>
Mon, 4 Nov 2013 06:06:08 +0000 (08:06 +0200)
committerMichael S. Tsirkin <[email protected]>
Mon, 4 Nov 2013 13:38:49 +0000 (15:38 +0200)
The page table logic in exec.c assumes
that memory addresses are at most TARGET_PHYS_ADDR_SPACE_BITS.

But pci addresses are full 64 bit so if we try to render them ignoring
the extra bits, we get strange effects with sections overlapping each
other.

To fix, simply limit the system memory size to
 1 << TARGET_PHYS_ADDR_SPACE_BITS,
pci addresses will be rendered within that.

Cc: [email protected]
Reported-by: Andreas Färber <[email protected]>
Reviewed-by: Paolo Bonzini <[email protected]>
Signed-off-by: Michael S. Tsirkin <[email protected]>
exec.c

diff --git a/exec.c b/exec.c
index b453713bdbde08e11610c9bdc7476dbda8168ada..79610ce37a67b5b1b4dda30790c526a37c87dc00 100644 (file)
--- a/exec.c
+++ b/exec.c
@@ -1741,7 +1741,12 @@ void address_space_destroy_dispatch(AddressSpace *as)
 static void memory_map_init(void)
 {
     system_memory = g_malloc(sizeof(*system_memory));
-    memory_region_init(system_memory, NULL, "system", INT64_MAX);
+
+    assert(TARGET_PHYS_ADDR_SPACE_BITS <= 64);
+
+    memory_region_init(system_memory, NULL, "system",
+                       TARGET_PHYS_ADDR_SPACE_BITS == 64 ?
+                       UINT64_MAX : (0x1ULL << TARGET_PHYS_ADDR_SPACE_BITS));
     address_space_init(&address_space_memory, system_memory, "memory");
 
     system_io = g_malloc(sizeof(*system_io));
This page took 0.030109 seconds and 4 git commands to generate.