Move HOST_LONG_BITS from qemu-common.h to qemu/osdep.h
qemu-common.h should only be included by .c files. Its file comment explains why: "No header file should depend on qemu-common.h, as this would easily lead to circular header dependencies." One of the reasons for headers to include it is HOST_LONG_BITS. Move that to its more natural home qemu/osdep.h, to facilitate removing these ill-advised includes later on. This also lets us use HOST_LONG_BITS in bswap.h instead of duplicating its definition there to avoid cyclic inclusion. Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
a7c4d9c7ca
commit
a813963216
|
@ -23,15 +23,6 @@
|
||||||
#include "qemu/option.h"
|
#include "qemu/option.h"
|
||||||
#include "qemu/host-utils.h"
|
#include "qemu/host-utils.h"
|
||||||
|
|
||||||
/* HOST_LONG_BITS is the size of a native pointer in bits. */
|
|
||||||
#if UINTPTR_MAX == UINT32_MAX
|
|
||||||
# define HOST_LONG_BITS 32
|
|
||||||
#elif UINTPTR_MAX == UINT64_MAX
|
|
||||||
# define HOST_LONG_BITS 64
|
|
||||||
#else
|
|
||||||
# error Unknown pointer size
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void cpu_ticks_init(void);
|
void cpu_ticks_init(void);
|
||||||
|
|
||||||
/* icount */
|
/* icount */
|
||||||
|
|
|
@ -419,11 +419,9 @@ static inline void stfq_be_p(void *ptr, float64 v)
|
||||||
|
|
||||||
static inline unsigned long leul_to_cpu(unsigned long v)
|
static inline unsigned long leul_to_cpu(unsigned long v)
|
||||||
{
|
{
|
||||||
/* In order to break an include loop between here and
|
#if HOST_LONG_BITS == 32
|
||||||
qemu-common.h, don't rely on HOST_LONG_BITS. */
|
|
||||||
#if ULONG_MAX == UINT32_MAX
|
|
||||||
return le_bswap(v, 32);
|
return le_bswap(v, 32);
|
||||||
#elif ULONG_MAX == UINT64_MAX
|
#elif HOST_LONG_BITS == 64
|
||||||
return le_bswap(v, 64);
|
return le_bswap(v, 64);
|
||||||
#else
|
#else
|
||||||
# error Unknown sizeof long
|
# error Unknown sizeof long
|
||||||
|
|
|
@ -127,6 +127,15 @@ extern int daemon(int, int);
|
||||||
#define TIME_MAX LONG_MAX
|
#define TIME_MAX LONG_MAX
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* HOST_LONG_BITS is the size of a native pointer in bits. */
|
||||||
|
#if UINTPTR_MAX == UINT32_MAX
|
||||||
|
# define HOST_LONG_BITS 32
|
||||||
|
#elif UINTPTR_MAX == UINT64_MAX
|
||||||
|
# define HOST_LONG_BITS 64
|
||||||
|
#else
|
||||||
|
# error Unknown pointer size
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef MIN
|
#ifndef MIN
|
||||||
#define MIN(a, b) (((a) < (b)) ? (a) : (b))
|
#define MIN(a, b) (((a) < (b)) ? (a) : (b))
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue