commit 59e9d91c7ae1b655997aec61c08eec1685414117
author Peter Maydell <peter.maydell@linaro.org> Thu Mar 08 14:40:33 2012 +0000
committer Riku Voipio <riku.voipio@linaro.org> Fri Apr 06 18:49:58 2012 +0300
tree 4c047f5d48774c57a0428c7cef98b15bfede8099
parent 39879bbbea4661a4004ca26673e3d1e6ae1e0bc3

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>

linux-user/main.c

diff --git a/linux-user/main.c b/linux-user/main.c
index 2570140..aa95db3 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -3420,6 +3420,7 @@
             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) {