aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2013-11-10 11:54:33 +0200
committerMichael S. Tsirkin <mst@redhat.com>2013-11-10 15:11:01 +0200
commitef9e455d645bed6d2360cd658dc00ca11a849877 (patch)
tree11fca457d80b059e1ee45cb9218f4b3b63d3e25c
parent0fbf50b6ec126600dca115adb1563c657cc27695 (diff)
Revert "exec: limit system memory size"
This reverts commit 818f86b88394b7b2b59d313e51043fe15a8004db. This was a work-around for bugs elsewhere in the system, exposed by commit a53ae8e934cd54686875b5bcfc2f434244ee55d6: "hw/pci: partially handle pci master abort" since that's reverted now, the work-around is not required for 1.7 anymore. The proper fix is supporting full 64 bit addresses in the radix tree. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Tested-by: Marcel Apfelbaum <marcel.a@redhat.com>
-rw-r--r--exec.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/exec.c b/exec.c
index 79610ce37a..b453713bdb 100644
--- a/exec.c
+++ b/exec.c
@@ -1741,12 +1741,7 @@ void address_space_destroy_dispatch(AddressSpace *as)
static void memory_map_init(void)
{
system_memory = g_malloc(sizeof(*system_memory));
-
- 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));
+ memory_region_init(system_memory, NULL, "system", INT64_MAX);
address_space_init(&address_space_memory, system_memory, "memory");
system_io = g_malloc(sizeof(*system_io));