From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60152) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U1P81-00039h-Tm for qemu-devel@nongnu.org; Fri, 01 Feb 2013 17:34:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U1P4Q-00027j-0p for qemu-devel@nongnu.org; Fri, 01 Feb 2013 17:30:37 -0500 Received: from mail-ie0-x22a.google.com ([2607:f8b0:4001:c03::22a]:38544) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U1P4P-00027X-SF for qemu-devel@nongnu.org; Fri, 01 Feb 2013 17:26:53 -0500 Received: by mail-ie0-f170.google.com with SMTP id c11so3968968ieb.1 for ; Fri, 01 Feb 2013 14:26:53 -0800 (PST) Sender: Richard Henderson From: Richard Henderson Date: Fri, 1 Feb 2013 14:26:48 -0800 Message-Id: <1359757608-1927-1-git-send-email-rth@twiddle.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] =?utf-8?q?=5BPATCH_v2=5D_bswap=3A_Fix_width_of_swap_?= =?utf-8?q?in_leul=5Fto=5Fcpu?= List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, afaerber@suse.de The misnamed HOST_LONG_BITS is really HOST_POINTER_BITS. Here we're explicitly using an unsigned long, rather than uintptr_t, so it is more correct to select the swap size via ULONG_MAX. Signed-off-by: Richard Henderson --- include/qemu/bswap.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) This is the patch from http://lists.gnu.org/archive/html/qemu-devel/2013-01/msg05868.html with the commit message re-worded as per Andreas Färber feedback. r~ diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index e6d4798..d3af35d 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -2,8 +2,8 @@ #define BSWAP_H #include "config-host.h" - #include +#include #include "fpu/softfloat.h" #ifdef CONFIG_MACHINE_BSWAP_H @@ -458,7 +458,15 @@ static inline void cpu_to_32wu(uint32_t *p, uint32_t v) static inline unsigned long leul_to_cpu(unsigned long v) { - return le_bswap(v, HOST_LONG_BITS); + /* In order to break an include loop between here and + qemu-common.h, don't rely on HOST_LONG_BITS. */ +#if ULONG_MAX == UINT32_MAX + return le_bswap(v, 32); +#elif ULONG_MAX == UINT64_MAX + return le_bswap(v, 64); +#else +# error Unknown sizeof long +#endif } #undef le_bswap -- 1.7.11.7