[Qemu-devel] [RFC v2 17/34] HACK: globalise TCG page size variables

[Peter Crosthwaite]

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 <address@hidden>
Signed-off-by: Peter Crosthwaite <address@hidden>
---
 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