From: Richard Henderson <rth@twiddle.net>
Date: Wed, 10 Mar 2010 22:38:59 +0000 (-0800)
Subject: linux-user: Use h2g_valid in qemu_vmalloc.
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7bc7b099dfa38a856b1bc892c0f9f3d6fe28e170;p=qemu.git

linux-user: Use h2g_valid in qemu_vmalloc.

Signed-off-by: Richard Henderson <rth@twiddle.net>
---

diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index 25fc0b2959..65fdc33c26 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -80,16 +80,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_ANONYMOUS, -1, 0);
 
-    addr = (unsigned long)p;
-    if (addr == (target_ulong) addr) {
-        /* Allocated region overlaps guest address space.
-           This may recurse.  */
+    if (h2g_valid(p)) {
+        /* Allocated region overlaps guest address space. This may recurse.  */
+        unsigned long addr = h2g(p);
         page_set_flags(addr & TARGET_PAGE_MASK, TARGET_PAGE_ALIGN(addr + size),
                        PAGE_RESERVED);
     }