From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41897) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YywUR-0002YF-4w for qemu-devel@nongnu.org; Sun, 31 May 2015 02:12:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YywUQ-0000c4-BN for qemu-devel@nongnu.org; Sun, 31 May 2015 02:12:55 -0400 Received: from mail-pd0-x233.google.com ([2607:f8b0:400e:c02::233]:36729) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YywUQ-0000bj-3M for qemu-devel@nongnu.org; Sun, 31 May 2015 02:12:54 -0400 Received: by pdjm12 with SMTP id m12so1207116pdj.3 for ; Sat, 30 May 2015 23:12:53 -0700 (PDT) From: Peter Crosthwaite Date: Sat, 30 May 2015 23:11:50 -0700 Message-Id: In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [RFC v2 17/34] HACK: globalise TCG page size variables List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Peter Crosthwaite , Alex Williamson , pbonzini@redhat.com, edgar.iglesias@gmail.com, afaerber@suse.de, rth@twiddle.net This is almost certainly wrong but it should work for my test case where TARGET_PAGE_SIZE is cross-arch consistent. This is needed to get vfio/pci.c to compile due to it's use of HOST_PAGE_ALIGN. Cc: Alex Williamson Signed-off-by: Peter Crosthwaite --- translate-all.c | 4 ---- translate-common.c | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/translate-all.c b/translate-all.c index bf0d689..4854828 100644 --- a/translate-all.c +++ b/translate-all.c @@ -117,10 +117,6 @@ typedef struct PageDesc { #define V_L1_SHIFT (L1_MAP_ADDR_SPACE_BITS - TARGET_PAGE_BITS - V_L1_BITS) -uintptr_t qemu_real_host_page_size; -uintptr_t qemu_host_page_size; -uintptr_t qemu_host_page_mask; - /* This is a multi-level map on the virtual address space. 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 806b36e..586d89a 100644 --- a/translate-common.c +++ b/translate-common.c @@ -21,6 +21,10 @@ #include "qemu-common.h" #include "qom/cpu.h" +uintptr_t qemu_real_host_page_size; +uintptr_t qemu_host_page_size; +uintptr_t qemu_host_page_mask; + #ifndef CONFIG_USER_ONLY /* mask must never be zero, except for A20 change call */ static void tcg_handle_interrupt(CPUState *cpu, int mask) -- 1.9.1