From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L7pu8-0007yV-CT for qemu-devel@nongnu.org; Wed, 03 Dec 2008 06:28:28 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L7ptx-0007pt-9o for qemu-devel@nongnu.org; Wed, 03 Dec 2008 06:28:20 -0500 Received: from [199.232.76.173] (port=33374 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L7ptw-0007ph-Fz for qemu-devel@nongnu.org; Wed, 03 Dec 2008 06:28:16 -0500 Received: from ug-out-1314.google.com ([66.249.92.170]:65305) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1L7ptt-0004Ce-S2 for qemu-devel@nongnu.org; Wed, 03 Dec 2008 06:28:14 -0500 Received: by ug-out-1314.google.com with SMTP id 29so3354860ugc.36 for ; Wed, 03 Dec 2008 03:27:36 -0800 (PST) From: "Kirill A. Shutemov" Date: Wed, 3 Dec 2008 13:29:39 +0200 Message-Id: <1228303789-25653-4-git-send-email-kirill@shutemov.name> In-Reply-To: <1228303789-25653-3-git-send-email-kirill@shutemov.name> References: <1228303789-25653-1-git-send-email-kirill@shutemov.name> <1228303789-25653-2-git-send-email-kirill@shutemov.name> <1228303789-25653-3-git-send-email-kirill@shutemov.name> Subject: [Qemu-devel] [PATCH] linux-user: Safety belt for h2g Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Kirill A. Shutemov" , Jan Kiszka From: Jan Kiszka h2g can only work on 64-bit hosts if the provided address is mappable to the guest range. Neglecting this was already the source for several bugs. Instrument the macro so that it will trigger earlier in the future (at least as long as we have this kind of mapping mechanism). Signed-off-by: Jan Kiszka Signed-off-by: Kirill A. Shutemov --- cpu-all.h | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/cpu-all.h b/cpu-all.h index 73c7b4c..526ace2 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -621,6 +621,9 @@ static inline void stfq_be_p(void *ptr, float64 v) /* MMU memory access macros */ #if defined(CONFIG_USER_ONLY) +#include +#include "qemu-types.h" + /* On some host systems the guest address space is reserved on the host. * This allows the guest address space to be offset to a convenient location. */ @@ -629,7 +632,12 @@ static inline void stfq_be_p(void *ptr, float64 v) /* All direct uses of g2h and h2g need to go away for usermode softmmu. */ #define g2h(x) ((void *)((unsigned long)(x) + GUEST_BASE)) -#define h2g(x) ((target_ulong)((unsigned long)(x) - GUEST_BASE)) +#define h2g(x) ({ \ + unsigned long __ret = (unsigned long)(x) - GUEST_BASE; \ + /* Check if given address fits target address space */ \ + assert(__ret == (abi_ulong)__ret); \ + (abi_ulong)__ret; \ +}) #define saddr(x) g2h(x) #define laddr(x) g2h(x) -- 1.6.0.2.GIT