Commit a8139632 authored by Markus Armbruster's avatar Markus Armbruster Committed by Paolo Bonzini
Browse files

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: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent a7c4d9c7

include/qemu-common.h

+0 −9
Original line number Diff line number Diff line
@@ -23,15 +23,6 @@ 
#include "qemu/option.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);



/* icount */

include/qemu/bswap.h

+2 −4
Original line number Diff line number Diff line
@@ -419,11 +419,9 @@ static inline void stfq_be_p(void *ptr, float64 v) 


static inline unsigned long leul_to_cpu(unsigned long v)

{

    /* 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

#if HOST_LONG_BITS == 32

    return le_bswap(v, 32);

#elif ULONG_MAX == UINT64_MAX

#elif HOST_LONG_BITS == 64

    return le_bswap(v, 64);

#else

# error Unknown sizeof long

include/qemu/osdep.h

+9 −0
Original line number Diff line number Diff line
@@ -127,6 +127,15 @@ extern int daemon(int, int); 
#define TIME_MAX LONG_MAX

#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

#define MIN(a, b) (((a) < (b)) ? (a) : (b))

#endif