From patchwork Wed Mar 31 15:25:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [4/3] move targphys.h and hw/poison.h inclusion to cpu-common.h Date: Wed, 31 Mar 2010 05:25:56 -0000 From: Paolo Bonzini X-Patchwork-Id: 49158 Message-Id: <1270049157-29784-1-git-send-email-pbonzini@redhat.com> To: qemu-devel@nongnu.org With more files from outside the hw/ directory being placed into libhw, avoid the need to include hw/hw.h for the sake of targ_phys_addr_t. Signed-off-by: Paolo Bonzini --- cpu-common.h | 8 ++++++++ hw/hw.h | 2 -- hw/poison.h => poison.h | 0 3 files changed, 8 insertions(+), 2 deletions(-) rename hw/poison.h => poison.h (100%) diff --git a/hw/poison.h b/poison.h similarity index 100% rename from hw/poison.h rename to poison.h diff --git a/cpu-common.h b/cpu-common.h index bb05300..2abd4a8 100644 --- a/cpu-common.h +++ b/cpu-common.h @@ -7,6 +7,14 @@ #define WORDS_ALIGNED #endif +#ifdef TARGET_PHYS_ADDR_BITS +#include "targphys.h" +#endif + +#ifndef NEED_CPU_H +#include "poison.h" +#endif + #include "bswap.h" #include "qemu-queue.h" diff --git a/hw/hw.h b/hw/hw.h index 7b500f4..328b704 100644 --- a/hw/hw.h +++ b/hw/hw.h @@ -5,8 +5,6 @@ #include "qemu-common.h" #if defined(TARGET_PHYS_ADDR_BITS) && !defined(NEED_CPU_H) -#include "targphys.h" -#include "poison.h" #include "cpu-common.h" #endif