summaryrefslogtreecommitdiff
path: root/hw/pc.c
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2011-02-09 19:35:51 +0100
committerAurelien Jarno <aurelien@aurel32.net>2011-02-20 15:13:59 +0100
commit1c69371006084f4d1b63283ac94a87d17dfdfb11 (patch)
tree287eec520be8fa058ae5953e8ca2fa3f8ebe0c62 /hw/pc.c
parent71deff27492fb97b0515492bc7ec2a38c6c27dde (diff)
downloadqemu-1c69371006084f4d1b63283ac94a87d17dfdfb11.tar.gz
pc: remove test on TARGET_PHYS_ADDR_BITS == 32
Both i386 and x86_64 targets are now using target_phys_bits=64. Remove useless code. Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'hw/pc.c')
-rw-r--r--hw/pc.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/hw/pc.c b/hw/pc.c
index 3d7e036c60..5966bf1c2c 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -980,11 +980,6 @@ void pc_memory_init(ram_addr_t ram_size,
*above_4g_mem_size_p = above_4g_mem_size;
*below_4g_mem_size_p = below_4g_mem_size;
-#if TARGET_PHYS_ADDR_BITS == 32
- if (above_4g_mem_size > 0) {
- hw_error("To much RAM for 32-bit physical address");
- }
-#endif
linux_boot = (kernel_filename != NULL);
/* allocate RAM */
@@ -994,12 +989,10 @@ void pc_memory_init(ram_addr_t ram_size,
cpu_register_physical_memory(0x100000,
below_4g_mem_size - 0x100000,
ram_addr + 0x100000);
-#if TARGET_PHYS_ADDR_BITS > 32
if (above_4g_mem_size > 0) {
cpu_register_physical_memory(0x100000000ULL, above_4g_mem_size,
ram_addr + below_4g_mem_size);
}
-#endif
/* BIOS load */
if (bios_name == NULL)