summaryrefslogtreecommitdiffstats
path: root/linux-user
diff options
context:
space:
mode:
Diffstat (limited to 'linux-user')
-rw-r--r--linux-user/elfload.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 4961e6119e..f6022fd704 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -2331,14 +2331,13 @@ static void pgb_reserved_va(const char *image_name, abi_ulong guest_loaddr,
assert(guest_base != 0);
test = g2h(0);
addr = mmap(test, reserved_va, PROT_NONE, flags, -1, 0);
- if (addr == MAP_FAILED) {
+ if (addr == MAP_FAILED || addr != test) {
error_report("Unable to reserve 0x%lx bytes of virtual address "
- "space (%s) for use as guest address space (check your "
- "virtual memory ulimit setting or reserve less "
- "using -R option)", reserved_va, strerror(errno));
+ "space at %p (%s) for use as guest address space (check your"
+ "virtual memory ulimit setting, min_mmap_addr or reserve less "
+ "using -R option)", reserved_va, test, strerror(errno));
exit(EXIT_FAILURE);
}
- assert(addr == test);
}
void probe_guest_base(const char *image_name, abi_ulong guest_loaddr,