summaryrefslogtreecommitdiffstats
path: root/linux-user/main.c
diff options
context:
space:
mode:
authorPeter Maydell2012-03-08 15:40:33 +0100
committerRiku Voipio2012-04-06 17:49:58 +0200
commit59e9d91c7ae1b655997aec61c08eec1685414117 (patch)
tree4c047f5d48774c57a0428c7cef98b15bfede8099 /linux-user/main.c
parentlinux-user: take RESERVED_VA into account for g2h_valid() (diff)
downloadqemu-59e9d91c7ae1b655997aec61c08eec1685414117.tar.gz
qemu-59e9d91c7ae1b655997aec61c08eec1685414117.tar.xz
qemu-59e9d91c7ae1b655997aec61c08eec1685414117.zip
linux-user: resolve reserved_va vma downwards
After consulting with Paul Brook, we concluded that it's best to search the VMA space downwards, so that we don't even get the chance to conflict with the brk range. This patch resolves a bunch of allocation conflicts when using -R. Signed-off-by: Alexander Graf <agraf@suse.de> [minor changes to get it to apply -- PMM] Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Diffstat (limited to 'linux-user/main.c')
-rw-r--r--linux-user/main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/linux-user/main.c b/linux-user/main.c
index 25701403e4..aa95db3a6d 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -3420,6 +3420,7 @@ int main(int argc, char **argv, char **envp)
guest_base = HOST_PAGE_ALIGN((unsigned long)p);
}
qemu_log("Reserved 0x%lx bytes of guest address space\n", reserved_va);
+ mmap_next_start = reserved_va;
}
if (reserved_va || have_guest_base) {