aboutsummaryrefslogtreecommitdiff
path: root/cpu-all.h
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2010-07-30 21:09:10 +0200
committerAurelien Jarno <aurelien@aurel32.net>2010-07-30 21:12:59 +0200
commite14aad448b9afcd7a2b249715768bf50c3b02034 (patch)
tree3908b0a1608dd70d1c4904295a4e0070fbd44eae /cpu-all.h
parent7829bc6c9f25d98038af889217aa30c94ef314f9 (diff)
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. (cherry picked from commit 18e9ea8a3f36b0a3845e1ac6d8acd180063bed8f)
Diffstat (limited to 'cpu-all.h')
-rw-r--r--cpu-all.h2
1 files changed, 2 insertions, 0 deletions
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. */