summaryrefslogtreecommitdiff
path: root/linux-user/elfload.c
diff options
context:
space:
mode:
authorPaul Brook <paul@codesourcery.com>2010-05-29 02:27:35 +0100
committerPaul Brook <paul@codesourcery.com>2010-05-29 02:27:35 +0100
commit68a1c816868b3e35a1da698af412b29e61b1948a (patch)
tree2f8ae184dd481d3a0e74d1de76fc7b53189fd97c /linux-user/elfload.c
parent0be1d07c0e4fa7395aca5129cfc5bb9a0a94a78c (diff)
downloadqemu-68a1c816868b3e35a1da698af412b29e61b1948a.tar.gz
Pre-allocate guest address space
Allow pre-allocation of the guest virtual address space in usermode emulation. Signed-off-by: Paul Brook <paul@codesourcery.com>
Diffstat (limited to 'linux-user/elfload.c')
-rw-r--r--linux-user/elfload.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 1f27918beb..2d920f2017 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -1682,7 +1682,7 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs,
* In case where user has not explicitly set the guest_base, we
* probe here that should we set it automatically.
*/
- if (!have_guest_base) {
+ if (!(have_guest_base || reserved_va)) {
/*
* Go through ELF program header table and find the address
* range used by loadable segments. Check that this is available on