From 37b76cfd938dafc89dc609cfb2c84719357867a5 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 1 Apr 2010 19:57:10 +0200 Subject: [PATCH] move targphys.h and hw/poison.h inclusion to cpu-common.h 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 Signed-off-by: Aurelien Jarno --- 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/cpu-common.h b/cpu-common.h index ce0221b19..b730ca033 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 7b500f4e4..328b704fd 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 diff --git a/hw/poison.h b/poison.h similarity index 100% rename from hw/poison.h rename to poison.h