From 18e9ea8a3f36b0a3845e1ac6d8acd180063bed8f Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Fri, 30 Jul 2010 21:09:10 +0200 Subject: linux-user: fix build on hosts not using guest base Commit 68a1c816868b3e35a1da698af412b29e61b1948a broke qemu on hosts not using guest base. It uses reserved_va unconditionally in mmap.c. To avoid to many #ifdef #endif blocks, define RESERVED_VA as either reserved_va or 0ul, and use it instead of reserved_va, similarly to what has been done with guest_base/GUEST_BASE. --- cpu-all.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'cpu-all.h') diff --git a/cpu-all.h b/cpu-all.h index 224ca40c1d..67a32664d5 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -629,8 +629,10 @@ extern unsigned long guest_base; extern int have_guest_base; extern unsigned long reserved_va; #define GUEST_BASE guest_base +#define RESERVED_VA reserved_va #else #define GUEST_BASE 0ul +#define RESERVED_VA 0ul #endif /* All direct uses of g2h and h2g need to go away for usermode softmmu. */ -- cgit v1.2.1