arm: include cpu-qom.h in files that require ARMCPU

This will keep things working when cpu.h will not be included
indirectly almost everywhere (either directly or through
qemu-common.h).

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c
index a5ea1e23703d706551c95237e8aa599f2da9cc8d..9c1dafbb19469c745fa5c6decad9758bab9f85ac 100644 (file)
--- a/hw/arm/stm32f205_soc.c
+++ b/hw/arm/stm32f205_soc.c
@@ -25,7 +25,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu-common.h"
-#include "cpu.h"
 #include "hw/arm/arm.h"
 #include "exec/address-spaces.h"
 #include "hw/arm/stm32f205_soc.h"

diff --git a/hw/arm/strongarm.h b/hw/arm/strongarm.h
index 2893f94445d9b398bc2da28704c5d33213e65c59..cd32bbdb0e2040bc18cbeecb1a7c780278001d9c 100644 (file)
--- a/hw/arm/strongarm.h
+++ b/hw/arm/strongarm.h
@@ -2,6 +2,7 @@
 #define _STRONGARM_H
 
 #include "exec/memory.h"
+#include "target-arm/cpu-qom.h"
 
 #define SA_CS0          0x00000000
 #define SA_CS1          0x08000000

diff --git a/include/hw/arm/arm.h b/include/hw/arm/arm.h
index b2517f9a43b3f10602f552500c54d50e4cc7e9f2..8b49a9833fc2925fc505a5f8d1265a069c8b490b 100644 (file)
--- a/include/hw/arm/arm.h
+++ b/include/hw/arm/arm.h
@@ -12,9 +12,9 @@
 #define ARM_MISC_H 1
 
 #include "exec/memory.h"
+#include "target-arm/cpu-qom.h"
 #include "hw/irq.h"
 #include "qemu/notify.h"
-#include "cpu.h"
 
 typedef enum {
     ARM_ENDIANNESS_UNKNOWN = 0,

diff --git a/include/hw/arm/exynos4210.h b/include/hw/arm/exynos4210.h
index 5c1820f88329eb87845255563a1f744db31dbd37..b6d929ddb745559aad631dc364b035c902a81b0b 100644 (file)
--- a/include/hw/arm/exynos4210.h
+++ b/include/hw/arm/exynos4210.h
@@ -28,6 +28,7 @@
 
 #include "qemu-common.h"
 #include "exec/memory.h"
+#include "target-arm/cpu-qom.h"
 
 #define EXYNOS4210_NCPUS                    2
 

diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h
index 0ad5fb883c58547f6bb5f194eedb61b550ca3798..f026c8df577fcf367b19e1f34e42550a8ea62dcd 100644 (file)
--- a/include/hw/arm/omap.h
+++ b/include/hw/arm/omap.h
@@ -20,6 +20,7 @@
 #include "exec/memory.h"
 # define hw_omap_h             "omap.h"
 #include "hw/irq.h"
+#include "target-arm/cpu-qom.h"
 
 # define OMAP_EMIFS_BASE       0x00000000
 # define OMAP2_Q0_BASE         0x00000000

diff --git a/include/hw/arm/pxa.h b/include/hw/arm/pxa.h
index 259b85249519fe3c0eeef95d1a0146b6ba546833..074feacd032e1286b88f6856b604c4f70d0a47f3 100644 (file)
--- a/include/hw/arm/pxa.h
+++ b/include/hw/arm/pxa.h
@@ -10,6 +10,7 @@
 # define PXA_H                 "pxa.h"
 
 #include "exec/memory.h"
+#include "target-arm/cpu-qom.h"
 
 /* Interrupt numbers */
 # define PXA2XX_PIC_SSP3       0