On Fri, Sep 18, 2015 at 11:52 AM, Dr. David Alan Gilbert <dgilb...@redhat.com> wrote: > * Paolo Bonzini (pbonz...@redhat.com) wrote: >> From: Peter Crosthwaite <crosthwaitepe...@gmail.com> >> >> Move the size and mask globals for the "real" host page size to >> translate-common. This is to allow system-level code to use >> REAL_HOST_PAGE_ALIGN and friends in builds which hide translate-all >> behind arch-obj. > > Are you intending to move the include definitions as well, because I > still can't use those definitions because they're still in cpu-all.h > which is tainted if I try and include it in anything not target-specific. >
Yes, that makes sense. I have only moved the impl as multi-arch is more about linkage organisation rather than code deps. Regards, Peter > Dave > >> Cc: dgilb...@redhat.com >> Signed-off-by: Peter Crosthwaite <crosthwaite.pe...@gmail.com> >> Message-Id: >> <b437638691f044bc690a7f03b1240c8b0f34ab57.1441614289.git.crosthwaite.pe...@gmail.com> >> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> >> --- >> translate-all.c | 2 -- >> translate-common.c | 3 +++ >> 2 files changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/translate-all.c b/translate-all.c >> index 0140255..4a9ee33 100644 >> --- a/translate-all.c >> +++ b/translate-all.c >> @@ -117,8 +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_real_host_page_mask; >> uintptr_t qemu_host_page_size; >> uintptr_t qemu_host_page_mask; >> >> diff --git a/translate-common.c b/translate-common.c >> index 681e2bf..619feb4 100644 >> --- a/translate-common.c >> +++ b/translate-common.c >> @@ -20,6 +20,9 @@ >> #include "qemu-common.h" >> #include "qom/cpu.h" >> >> +uintptr_t qemu_real_host_page_size; >> +uintptr_t qemu_real_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) >> -- >> 2.5.0 >> >> > -- > Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK