[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 21/50] arm: include cpu-qom.h in files that require
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 21/50] arm: include cpu-qom.h in files that require ARMCPU |
Date: |
Fri, 8 Apr 2016 22:28:41 +0200 |
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 <address@hidden>
---
hw/arm/stm32f205_soc.c | 1 -
hw/arm/strongarm.h | 1 +
include/hw/arm/arm.h | 2 +-
include/hw/arm/exynos4210.h | 1 +
include/hw/arm/omap.h | 1 +
include/hw/arm/pxa.h | 1 +
6 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c
index a5ea1e2..9c1dafb 100644
--- 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 2893f94..cd32bbd 100644
--- 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 b2517f9..8b49a98 100644
--- 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 5c1820f..b6d929d 100644
--- 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 0ad5fb8..f026c8d 100644
--- 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 259b852..074feac 100644
--- 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
--
1.8.3.1
- [Qemu-devel] [PATCH 12/50] target-mips: make cpu-qom.h not target specific, (continued)
- [Qemu-devel] [PATCH 12/50] target-mips: make cpu-qom.h not target specific, Paolo Bonzini, 2016/04/08
- [Qemu-devel] [PATCH 08/50] target-i386: make cpu-qom.h not target specific, Paolo Bonzini, 2016/04/08
- [Qemu-devel] [PATCH 15/50] target-s390x: make cpu-qom.h not target specific, Paolo Bonzini, 2016/04/08
- [Qemu-devel] [PATCH 10/50] target-m68k: make cpu-qom.h not target specific, Paolo Bonzini, 2016/04/08
- [Qemu-devel] [PATCH 16/50] target-sh4: make cpu-qom.h not target specific, Paolo Bonzini, 2016/04/08
- [Qemu-devel] [PATCH 18/50] target-tricore: make cpu-qom.h not target specific, Paolo Bonzini, 2016/04/08
- [Qemu-devel] [PATCH 11/50] target-microblaze: make cpu-qom.h not target specific, Paolo Bonzini, 2016/04/08
- [Qemu-devel] [PATCH 13/50] target-ppc: do not use target_ulong in cpu-qom.h, Paolo Bonzini, 2016/04/08
- [Qemu-devel] [PATCH 14/50] target-ppc: make cpu-qom.h not target specific, Paolo Bonzini, 2016/04/08
- [Qemu-devel] [PATCH 22/50] m68k: include cpu-qom.h in files that require M68KCPU, Paolo Bonzini, 2016/04/08
- [Qemu-devel] [PATCH 21/50] arm: include cpu-qom.h in files that require ARMCPU,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 23/50] sh4: include cpu-qom.h in files that require SuperHCPU, Paolo Bonzini, 2016/04/08
- [Qemu-devel] [PATCH 20/50] target-xtensa: make cpu-qom.h not target specific, Paolo Bonzini, 2016/04/08
- [Qemu-devel] [PATCH 29/50] explicitly include hw/qdev-core.h, Paolo Bonzini, 2016/04/08
- [Qemu-devel] [PATCH 17/50] target-sparc: make cpu-qom.h not target specific, Paolo Bonzini, 2016/04/08
- [Qemu-devel] [PATCH 30/50] explicitly include linux/kvm.h, Paolo Bonzini, 2016/04/08
- [Qemu-devel] [PATCH 32/50] include: poison symbols in osdep.h, Paolo Bonzini, 2016/04/08
- [Qemu-devel] [PATCH 33/50] hw: do not use VMSTATE_*TL, Paolo Bonzini, 2016/04/08
- [Qemu-devel] [PATCH 35/50] hw: cannot include hw/hw.h from user emulation, Paolo Bonzini, 2016/04/08
- [Qemu-devel] [PATCH 36/50] cpu: move endian-dependent load/store functions to cpu-all.h, Paolo Bonzini, 2016/04/08
- [Qemu-devel] [PATCH 34/50] hw: move CPU state serialization to migration/cpu.h, Paolo Bonzini, 2016/04/08