From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 13 May 2013 13:54:44 +0000 (+0200)
Subject: s390x: reduce TARGET_PHYS_ADDR_SPACE_BITS to 62
X-Git-Tag: qemu-xen-4.4.0-rc1~6^2~368^2~3
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=311f83ca08c011b048c063c2fd3038a8957970bc;p=qemu-upstream-4.5-testing.git

s390x: reduce TARGET_PHYS_ADDR_SPACE_BITS to 62

With the next patch, the memory API will complain if the
TARGET_PHYS_ADDR_SPACE_BITS gets dangerously close to an
overflow.  s390x can handle up to 64 bit of physical address
space from its page tables, but we never use that much.  Just
decrease the value.

Cc: Alexander Graf <agraf@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h
index 0ce82cf83..6304c4d90 100644
--- a/target-s390x/cpu.h
+++ b/target-s390x/cpu.h
@@ -34,7 +34,10 @@
 #include "exec/cpu-defs.h"
 #define TARGET_PAGE_BITS 12
 
-#define TARGET_PHYS_ADDR_SPACE_BITS 64
+/* Actually 64-bits, limited by the memory API to 62 bits.  We
+ * never use that much.
+ */
+#define TARGET_PHYS_ADDR_SPACE_BITS 62
 #define TARGET_VIRT_ADDR_SPACE_BITS 64
 
 #include "exec/cpu-all.h"