Merge remote-tracking branch 'riku/linux-user-for-upstream' into staging

[mirror_qemu.git] / include / exec / cpu-all.h

diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index f2800ec6820f002cfc9545e56c9ff0b214fc455b..a407b50f4a0e9f343211460c0d12e55ffc199e0e 100644 (file)
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -210,11 +210,15 @@ extern unsigned long reserved_va;
 })
 #endif
 
-#define h2g(x) ({ \
+#define h2g_nocheck(x) ({ \
     unsigned long __ret = (unsigned long)(x) - GUEST_BASE; \
+    (abi_ulong)__ret; \
+})
+
+#define h2g(x) ({ \
     /* Check if given address fits target address space */ \
     assert(h2g_valid(x)); \
-    (abi_ulong)__ret; \
+    h2g_nocheck(x); \
 })
 
 #define saddr(x) g2h(x)