david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bswap: Fix width of swap in leul_to_cpu

Browse Source 
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.

Acked-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Richard Henderson 2013-02-04 16:21:06 -08:00 committed by Anthony Liguori
parent 5f876756c5
commit 91107fdf44
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/qemu/bswap.h
View File

@ -2,8 +2,8 @@
#define BSWAP_H #define BSWAP_H
#include "config-host.h" #include "config-host.h"
#include <inttypes.h> #include <inttypes.h>
#include <limits.h>
#include "fpu/softfloat.h" #include "fpu/softfloat.h"
#ifdef CONFIG_MACHINE_BSWAP_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) 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 #undef le_bswap