d5f1f46341
- add fixes for reserved_va mmap(NULL) case, fixes git build on arm OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=59
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From 8954d20f70430ddd4f6add000fd8bf82d5ddcb27 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Graf <agraf@suse.de>
|
|
Date: Wed, 14 Dec 2011 00:33:28 +0100
|
|
Subject: [PATCH] linux-user: reserve 4GB of vmem for 32-on-64
|
|
|
|
When running 32-on-64 bit guests, we should always reserve as much
|
|
virtual memory as we possibly can for the guest process, so it can
|
|
never overlap with QEMU address space.
|
|
|
|
Fortunately we already have the infrastructure for that. All that's
|
|
missing is some sane default value to also make use of it!
|
|
|
|
Signed-off-by: Alexander Graf <agraf@suse.de>
|
|
---
|
|
linux-user/main.c | 11 +++++++++++
|
|
1 files changed, 11 insertions(+), 0 deletions(-)
|
|
|
|
diff --git a/linux-user/main.c b/linux-user/main.c
|
|
index 788ff98..3ffee40 100644
|
|
--- a/linux-user/main.c
|
|
+++ b/linux-user/main.c
|
|
@@ -48,8 +48,19 @@ unsigned long mmap_min_addr;
|
|
#if defined(CONFIG_USE_GUEST_BASE)
|
|
unsigned long guest_base;
|
|
int have_guest_base;
|
|
+#if (TARGET_LONG_BITS == 32) && (HOST_LONG_BITS == 64)
|
|
+/*
|
|
+ * When running 32-on-64 we should make sure we can fit all of the possible
|
|
+ * guest address space into a contiguous chunk of virtual host memory.
|
|
+ *
|
|
+ * This way we will never overlap with our own libraries or binaries or stack
|
|
+ * or anything else that QEMU maps.
|
|
+ */
|
|
+unsigned long reserved_va = 0xf7000000;
|
|
+#else
|
|
unsigned long reserved_va;
|
|
#endif
|
|
+#endif
|
|
|
|
static void usage(void);
|
|
extern int use_stopflag;
|