[Qemu-devel] [PATCH 1/2] target-i386: set target_phys_bits to 64

[Qemu-devel] [PATCH 1/2] target-i386: set target_phys_bits to 64

[Aurelien Jarno]

qemu i386 used to support more than 4GB of RAM through PAE, but it has
been disabled for an unknown reason. Reenable it.

Note that simply running qemu x86_64 and emulating a 32-bit CPU is not
a solution to this problem as it is about 15% slower (it needs to
emulate 64 bit registers even if half of them are not used). On the
other hand, I haven't seen any measurable impact by switching
target_phys_bits to 64.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---
 configure |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index 598e8e1..563adf4 100755
--- a/configure
+++ b/configure
@@ -2909,7 +2909,7 @@ TARGET_ABI_DIR=""
 
 case "$target_arch2" in
   i386)
-    target_phys_bits=32
+    target_phys_bits=64
   ;;
   x86_64)
     TARGET_BASE_ARCH=i386
-- 
1.7.2.3

[Qemu-devel] [PATCH 2/2] pc: remove test on TARGET_PHYS_ADDR_BITS == 32

[Aurelien Jarno]

Both i386 and x86_64 targets are now using with target_phys_bits=64.
Remove useless code.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---
 hw/pc.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/hw/pc.c b/hw/pc.c
index 4dfdc0b..92e3843 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -968,11 +968,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 */
@@ -982,12 +977,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)
-- 
1.7.2.3