Patchwork [5/7] linux-user: Use h2g_valid in qemu_vmalloc.

login
register
mail settings
Submitter Richard Henderson
Date Feb. 11, 2010, 11:11 p.m.
Message ID <0904b2af2ae800f8dd4d39f3219feead40c93cb7.1266267595.git.rth@twiddle.net>
Download mbox | patch
Permalink /patch/45431/
State New
Headers show

Comments

Richard Henderson - Feb. 11, 2010, 11:11 p.m.
---
 linux-user/mmap.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

Patch

diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index 25fc0b2..65fdc33 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);
     }