From: Peter Crosthwaite <crosthwaitepe...@gmail.com> Device land code that needs cpu.h only needs it for architecture specific reasons. So include target-arm/cpu.h explicitly rather than the one provided by common code.
This prepares support for multi-arch where the common cpu.h will be minimal and not contain any arch specifics. Signed-off-by: Peter Crosthwaite <crosthwaite.pe...@gmail.com> --- hw/arm/strongarm.h | 2 ++ include/hw/arm/arm.h | 3 +++ include/hw/arm/digic.h | 2 ++ include/hw/arm/exynos4210.h | 2 ++ include/hw/arm/omap.h | 2 ++ include/hw/arm/pxa.h | 2 ++ 6 files changed, 13 insertions(+) diff --git a/hw/arm/strongarm.h b/hw/arm/strongarm.h index 2893f94..6f5d163 100644 --- a/hw/arm/strongarm.h +++ b/hw/arm/strongarm.h @@ -3,6 +3,8 @@ #include "exec/memory.h" +#include "target-arm/cpu.h" + #define SA_CS0 0x00000000 #define SA_CS1 0x08000000 #define SA_CS2 0x10000000 diff --git a/include/hw/arm/arm.h b/include/hw/arm/arm.h index 4dcd4f9..cddb38d 100644 --- a/include/hw/arm/arm.h +++ b/include/hw/arm/arm.h @@ -11,6 +11,9 @@ #ifndef ARM_MISC_H #define ARM_MISC_H 1 +#include "qemu-common.h" +#include "target-arm/cpu.h" + #include "exec/memory.h" #include "hw/irq.h" #include "qemu/notify.h" diff --git a/include/hw/arm/digic.h b/include/hw/arm/digic.h index a739d6a..9f4bd52 100644 --- a/include/hw/arm/digic.h +++ b/include/hw/arm/digic.h @@ -23,6 +23,8 @@ #include "hw/timer/digic-timer.h" #include "hw/char/digic-uart.h" +#include "target-arm/cpu.h" + #define TYPE_DIGIC "digic" #define DIGIC(obj) OBJECT_CHECK(DigicState, (obj), TYPE_DIGIC) diff --git a/include/hw/arm/exynos4210.h b/include/hw/arm/exynos4210.h index 5c1820f..3fb9684 100644 --- a/include/hw/arm/exynos4210.h +++ b/include/hw/arm/exynos4210.h @@ -29,6 +29,8 @@ #include "qemu-common.h" #include "exec/memory.h" +#include "target-arm/cpu.h" + #define EXYNOS4210_NCPUS 2 #define EXYNOS4210_DRAM0_BASE_ADDR 0x40000000 diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h index 0ad5fb8..7e0d0e4 100644 --- a/include/hw/arm/omap.h +++ b/include/hw/arm/omap.h @@ -21,6 +21,8 @@ # define hw_omap_h "omap.h" #include "hw/irq.h" +#include "target-arm/cpu.h" + # define OMAP_EMIFS_BASE 0x00000000 # define OMAP2_Q0_BASE 0x00000000 # define OMAP_CS0_BASE 0x00000000 diff --git a/include/hw/arm/pxa.h b/include/hw/arm/pxa.h index 259b852..4d2f1f3 100644 --- a/include/hw/arm/pxa.h +++ b/include/hw/arm/pxa.h @@ -11,6 +11,8 @@ #include "exec/memory.h" +#include "target-arm/cpu.h" + /* Interrupt numbers */ # define PXA2XX_PIC_SSP3 0 # define PXA2XX_PIC_USBH2 2 -- 1.9.1