From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40471) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a44sU-00010G-5S for qemu-devel@nongnu.org; Wed, 02 Dec 2015 05:43:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a44sT-0007wR-5R for qemu-devel@nongnu.org; Wed, 02 Dec 2015 05:43:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56296) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a44sT-0007wL-0G for qemu-devel@nongnu.org; Wed, 02 Dec 2015 05:43:13 -0500 From: "Dr. David Alan Gilbert (git)" Date: Wed, 2 Dec 2015 10:43:09 +0000 Message-Id: <1449052989-30152-1-git-send-email-dgilbert@redhat.com> Subject: [Qemu-devel] [For 2.5?? PATCH 1/1] qemu_{real_}host_page_[size|mask] change types to ram_addr_t List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, pbonzini@redhat.com, anthony.perard@citrix.com Cc: quintela@redhat.com, stefano.stabellini@eu.citrix.com From: "Dr. David Alan Gilbert" Anthony reported that >4GB guests on Xen with 32bit QEMU broke after my 4ed023c (Round up RAMBlock sizes). In that patch I mask sizes against qemu_host_page_size/mask which are uintptr_t, and thus 32bit on a 32bit QEMU, even though the ram space might be bigger than 4GB on Xen. ram_addr_t is uintptr_t on KVM and uint64_t on Xen; so there should be no change on KVM, and on Xen we always get the larger size. Remove the ~10 year old scary comment that the type of these variables is probably wrong. Signed-off-by: Dr. David Alan Gilbert Reported-by: Anthony PERARD Fixes: 4ed023ce2a39ab5812d33cf4d819def168965a7f --- include/exec/cpu-all.h | 9 ++++----- translate-all.c | 4 ++-- translate-common.c | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index f9998b9..e23b852 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -174,11 +174,10 @@ extern unsigned long reserved_va; #define TARGET_PAGE_MASK ~(TARGET_PAGE_SIZE - 1) #define TARGET_PAGE_ALIGN(addr) (((addr) + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK) -/* ??? These should be the larger of uintptr_t and target_ulong. */ -extern uintptr_t qemu_real_host_page_size; -extern uintptr_t qemu_real_host_page_mask; -extern uintptr_t qemu_host_page_size; -extern uintptr_t qemu_host_page_mask; +extern ram_addr_t qemu_real_host_page_size; +extern ram_addr_t qemu_real_host_page_mask; +extern ram_addr_t qemu_host_page_size; +extern ram_addr_t qemu_host_page_mask; #define HOST_PAGE_ALIGN(addr) (((addr) + qemu_host_page_size - 1) & qemu_host_page_mask) #define REAL_HOST_PAGE_ALIGN(addr) (((addr) + qemu_real_host_page_size - 1) & \ diff --git a/translate-all.c b/translate-all.c index a940bd2..317f251 100644 --- a/translate-all.c +++ b/translate-all.c @@ -117,8 +117,8 @@ typedef struct PageDesc { #define V_L1_SHIFT (L1_MAP_ADDR_SPACE_BITS - TARGET_PAGE_BITS - V_L1_BITS) -uintptr_t qemu_host_page_size; -uintptr_t qemu_host_page_mask; +ram_addr_t qemu_host_page_size; +ram_addr_t qemu_host_page_mask; /* The bottom level has pointers to PageDesc */ static void *l1_map[V_L1_SIZE]; diff --git a/translate-common.c b/translate-common.c index 619feb4..2fe2d1e 100644 --- a/translate-common.c +++ b/translate-common.c @@ -20,8 +20,8 @@ #include "qemu-common.h" #include "qom/cpu.h" -uintptr_t qemu_real_host_page_size; -uintptr_t qemu_real_host_page_mask; +ram_addr_t qemu_real_host_page_size; +ram_addr_t qemu_real_host_page_mask; #ifndef CONFIG_USER_ONLY /* mask must never be zero, except for A20 change call */ -- 2.5.0