Fix bsd-user qemu_vmalloc() host page protection code
authorJuergen Lock <nox@jelal.kn-bremen.de>
Thu, 25 Mar 2010 21:11:17 +0000 (22:11 +0100)
committerBlue Swirl <blauwirbel@gmail.com>
Tue, 30 Mar 2010 17:44:51 +0000 (17:44 +0000)
Just do the same as linux-user does.

Signed-off-by: Juergen Lock <nox@jelal.kn-bremen.de>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
bsd-user/mmap.c

index 139cd3f4422e599fe28f7eddfa851a7fe846ae3a..207c774fb057fa494fb317b1967682efce6473e7 100644 (file)
@@ -77,16 +77,15 @@ void mmap_unlock(void)
 void *qemu_vmalloc(size_t size)
 {
     void *p;
-    unsigned long addr;
     mmap_lock();
     /* Use map and mark the pages as used.  */
     p = mmap(NULL, size, PROT_READ | PROT_WRITE,
              MAP_PRIVATE | MAP_ANON, -1, 0);
 
-    addr = (unsigned long)p;
-    if (addr == (target_ulong) addr) {
+    if (h2g_valid(p)) {
         /* Allocated region overlaps guest address space.
            This may recurse.  */
+        abi_ulong addr = h2g(p);
         page_set_flags(addr & TARGET_PAGE_MASK, TARGET_PAGE_ALIGN(addr + size),
                        PAGE_RESERVED);
     }