cpu: move exec-all.h inclusion out of cpu.h

exec-all.h contains TCG-specific definitions.  It is not needed outside
TCG-specific files such as translate.c, exec.c or *helper.c.

One generic function had snuck into include/exec/exec-all.h; move it to
include/qom/cpu.h.

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

diff --git a/bsd-user/main.c b/bsd-user/main.c
index 058eaca1a7c7579332946847c955c141c99413a0..8e338c7f22f471a828efd4518fb7161ee5aebae2 100644 (file)
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -25,6 +25,7 @@
 #include "qemu/help_option.h"
 /* For tb_lock */
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "tcg.h"
 #include "qemu/timer.h"
 #include "qemu/envlist.h"

diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index 03b502ad37edf6df9e1d3e61382e41bc09534572..53163b8a476cb2a34deca0e6ecb1797ec4c1be50 100644 (file)
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -19,6 +19,7 @@
 
 
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 
 #undef DEBUG_REMAP

diff --git a/cpu-exec-common.c b/cpu-exec-common.c
index 6bdda6b6b0e3657338150e641b15a2ef6da6c222..132cd03cde5b92f13285b8f7a89c7a5d14786ca6 100644 (file)
--- a/cpu-exec-common.c
+++ b/cpu-exec-common.c
@@ -20,6 +20,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "sysemu/cpus.h"
+#include "exec/exec-all.h"
 #include "exec/memory-internal.h"
 
 bool exit_request;

diff --git a/cpu-exec.c b/cpu-exec.c
index 14df1aacf42a4dd89d6647b2c7ad639f35d9979f..602d0c4d0cc850ddaab79394d065a405bc8582aa 100644 (file)
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -20,6 +20,7 @@
 #include "cpu.h"
 #include "trace.h"
 #include "disas/disas.h"
+#include "exec/exec-all.h"
 #include "tcg.h"
 #include "qemu/atomic.h"
 #include "sysemu/qtest.h"

diff --git a/cpus.c b/cpus.c
index 7b6ebebde796c2a71051d1966f50c9d3bf7ed8c9..eb34b4fe76560b41cf783f401fa6a222dd963036 100644 (file)
--- a/cpus.c
+++ b/cpus.c
@@ -35,6 +35,7 @@
 #include "sysemu/dma.h"
 #include "sysemu/kvm.h"
 #include "qmp-commands.h"
+#include "exec/exec-all.h"
 
 #include "qemu/thread.h"
 #include "sysemu/cpus.h"

diff --git a/cputlb.c b/cputlb.c
index 167280ae9699dc03ff21c7d8e633946c2b566f2b..1ff6354b04ec8efbb67c8894b640f0e60ed48811 100644 (file)
--- a/cputlb.c
+++ b/cputlb.c
@@ -28,6 +28,7 @@
 
 #include "exec/memory-internal.h"
 #include "exec/ram_addr.h"
+#include "exec/exec-all.h"
 #include "tcg/tcg.h"
 
 /* DEBUG defines, enable DEBUG_TLB_LOG to log to the CPU_LOG_MMU target */

diff --git a/disas/tci.c b/disas/tci.c
index 1cdf5eeafca98cd3864ac251d45140ae9dceb8bd..7233343fa109a882cb5b85a22a62df8666fbb4c1 100644 (file)
--- a/disas/tci.c
+++ b/disas/tci.c
@@ -20,6 +20,7 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "disas/bfd.h"
+#include "exec/exec-all.h"
 #include "tcg/tcg.h"
 
 /* Disassemble TCI bytecode. */

diff --git a/exec.c b/exec.c
index d26df5570684747ada4f1543f14135a60afa652b..e276ec39e12a76ee8200fa3b490f8ee8485bc21c 100644 (file)
--- a/exec.c
+++ b/exec.c
@@ -24,6 +24,7 @@
 
 #include "qemu/cutils.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "tcg.h"
 #include "hw/qdev-core.h"
 #if !defined(CONFIG_USER_ONLY)

diff --git a/gdbstub.c b/gdbstub.c
index c19ce39bdcbe29c68a43e3e9c274ef3a8acef843..b9e3710bfec3a941ac3970a0118f5414160aa75f 100644 (file)
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -35,6 +35,7 @@
 #include "qemu/sockets.h"
 #include "sysemu/kvm.h"
 #include "exec/semihost.h"
+#include "exec/exec-all.h"
 
 #ifdef CONFIG_USER_ONLY
 #define GDB_ATTACHED "0"

diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c
index 466c3c4cd77491798cba14c6ba33f276a88fe246..8fd27ba2f40434b9ad5698b46126414b38ffa234 100644 (file)
--- a/hw/i386/kvmvapic.c
+++ b/hw/i386/kvmvapic.c
@@ -11,6 +11,7 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/cpus.h"
 #include "sysemu/kvm.h"

diff --git a/hw/misc/mips_itu.c b/hw/misc/mips_itu.c
index fda7201940efbb9aab912d906782f790c32a4cf1..ef935b51a8052919dd569f54e98f291555bbfed8 100644 (file)
--- a/hw/misc/mips_itu.c
+++ b/hw/misc/mips_itu.c
@@ -21,6 +21,7 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "qemu/log.h"
+#include "exec/exec-all.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
index c5fecb50e64a427baa872a186ea70de3deeb00ae..feb36296646ddf90243b6c2619ac2ef78a65144d 100644 (file)
--- a/hw/ppc/spapr_hcall.c
+++ b/hw/ppc/spapr_hcall.c
@@ -3,6 +3,7 @@
 #include "sysemu/sysemu.h"
 #include "qemu/log.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "helper_regs.h"
 #include "hw/ppc/spapr.h"
 #include "mmu-hash64.h"

diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c
index a1ea760f68abba5d50587c0614c3d61700753faf..3132d559d75da68c11afd90a8a0e66ac03aafe40 100644 (file)
--- a/hw/sh4/sh7750.c
+++ b/hw/sh4/sh7750.c
@@ -30,6 +30,7 @@
 #include "sh7750_regnames.h"
 #include "hw/sh4/sh_intc.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "exec/address-spaces.h"
 
 #define NB_DEVICES 4

diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
index fd30a0cba66de531b7c3ca7847279db8c371d455..b6a4a122da6648c61027ca1ef0054820c2408726 100644 (file)
--- a/include/exec/exec-all.h
+++ b/include/exec/exec-all.h
@@ -81,15 +81,6 @@ void cpu_reloading_memory_map(void);
  * Note that with KVM only one address space is supported.
  */
 void cpu_address_space_init(CPUState *cpu, AddressSpace *as, int asidx);
-/**
- * cpu_get_address_space:
- * @cpu: CPU to get address space from
- * @asidx: index identifying which address space to get
- *
- * Return the requested address space of this CPU. @asidx
- * specifies which address space to read.
- */
-AddressSpace *cpu_get_address_space(CPUState *cpu, int asidx);
 /* cputlb.c */
 /**
  * tlb_flush_page:

diff --git a/include/qom/cpu.h b/include/qom/cpu.h
index b8d9fb1384bdb991fd98e9541a66c9b98d431eb5..c9ba16ca824710a5c159c8abdd9099bf943d270f 100644 (file)
--- a/include/qom/cpu.h
+++ b/include/qom/cpu.h
@@ -824,6 +824,16 @@ int cpu_watchpoint_remove(CPUState *cpu, vaddr addr,
 void cpu_watchpoint_remove_by_ref(CPUState *cpu, CPUWatchpoint *watchpoint);
 void cpu_watchpoint_remove_all(CPUState *cpu, int mask);
 
+/**
+ * cpu_get_address_space:
+ * @cpu: CPU to get address space from
+ * @asidx: index identifying which address space to get
+ *
+ * Return the requested address space of this CPU. @asidx
+ * specifies which address space to read.
+ */
+AddressSpace *cpu_get_address_space(CPUState *cpu, int asidx);
+
 void QEMU_NORETURN cpu_abort(CPUState *cpu, const char *fmt, ...)
     GCC_FMT_ATTR(2, 3);
 void cpu_exec_exit(CPUState *cpu);

diff --git a/linux-user/main.c b/linux-user/main.c
index 2b7fa9c6212e206c6e1b0370b6db55e20aca6bb7..ba38aed4314fbfff577ef497d517077c21fa0625 100644 (file)
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -26,6 +26,7 @@
 #include "qemu/cutils.h"
 #include "qemu/help_option.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "tcg.h"
 #include "qemu/timer.h"
 #include "qemu/envlist.h"

diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index 26b0ba2736f53b27b803f93b37e47398442087b1..208c63eb2aa0eeb85ae62b5398faca478938d33b 100644 (file)
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -3,6 +3,7 @@
 
 
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 
 #undef DEBUG_REMAP

diff --git a/monitor.c b/monitor.c
index a2c1ad2e7b8fdaf9c305ffa493c30f97ce8be2a9..0129936fbec13a70e46fe3c4bb0aafad67c98e6e 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -71,6 +71,7 @@
 #include "trace/simple.h"
 #endif
 #include "exec/memory.h"
+#include "exec/exec-all.h"
 #include "qemu/log.h"
 #include "qmp-commands.h"
 #include "hmp.h"

diff --git a/target-alpha/cpu.c b/target-alpha/cpu.c
index 8a155cae900072c5cf1cbb395dedc75bab5cb136..6d01d7f75e9e92599feb25269e9539e0d114aab3 100644 (file)
--- a/target-alpha/cpu.c
+++ b/target-alpha/cpu.c
@@ -24,6 +24,7 @@
 #include "cpu.h"
 #include "qemu-common.h"
 #include "migration/vmstate.h"
+#include "exec/exec-all.h"
 
 
 static void alpha_cpu_set_pc(CPUState *cs, vaddr value)

diff --git a/target-alpha/cpu.h b/target-alpha/cpu.h
index d389a3554c91118ae4b265046372ff0d09f6f03b..e71ea70ea1f19a5af5a03ff99450c9b9fe8818ee 100644 (file)
--- a/target-alpha/cpu.h
+++ b/target-alpha/cpu.h
@@ -525,6 +525,4 @@ static inline void cpu_get_tb_cpu_state(CPUAlphaState *env, target_ulong *pc,
     *pflags = flags;
 }
 
-#include "exec/exec-all.h"
-
 #endif /* !defined (__CPU_ALPHA_H__) */

diff --git a/target-alpha/fpu_helper.c b/target-alpha/fpu_helper.c
index 5ab7d5e64db92bdc8939021fed09dc88a3d7295f..9645978aaaae0f6b6cb2179147f86608e9cbe788 100644 (file)
--- a/target-alpha/fpu_helper.c
+++ b/target-alpha/fpu_helper.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "fpu/softfloat.h"
 

diff --git a/target-alpha/helper.c b/target-alpha/helper.c
index 6dec2639b141490340b2ca1f4ef0d90feb8f7345..85168b7ed16425377e18c605ed63043ca7e10f50 100644 (file)
--- a/target-alpha/helper.c
+++ b/target-alpha/helper.c
@@ -20,6 +20,7 @@
 #include "qemu/osdep.h"
 
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "fpu/softfloat.h"
 #include "exec/helper-proto.h"
 

diff --git a/target-alpha/int_helper.c b/target-alpha/int_helper.c
index 777e48d0840edf2e50d62568aebadc39fed91ab0..19bebfe7424e2b5b82184b92d4e069dd27eb9fe5 100644 (file)
--- a/target-alpha/int_helper.c
+++ b/target-alpha/int_helper.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "qemu/host-utils.h"
 

diff --git a/target-alpha/mem_helper.c b/target-alpha/mem_helper.c
index 7fee9a6e2b47665338150c0c045da50146e5ff10..7f4d15fef261ad5b7931af521193b7c110bf061a 100644 (file)
--- a/target-alpha/mem_helper.c
+++ b/target-alpha/mem_helper.c
@@ -20,6 +20,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 
 /* Softmmu support */

diff --git a/target-alpha/sys_helper.c b/target-alpha/sys_helper.c
index e2dec15b6030448074356bd166fd4c956eaa75a6..bec1e178be779cfc9e63f5fe75b6d5a300d2f63f 100644 (file)
--- a/target-alpha/sys_helper.c
+++ b/target-alpha/sys_helper.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "sysemu/sysemu.h"
 #include "qemu/timer.h"

diff --git a/target-alpha/translate.c b/target-alpha/translate.c
index 8c2183a418e3cead20c44e82da76663ebcdf27b3..76dab154eec09948944d554ed548d2922cf809ed 100644 (file)
--- a/target-alpha/translate.c
+++ b/target-alpha/translate.c
@@ -21,6 +21,7 @@
 #include "cpu.h"
 #include "disas/disas.h"
 #include "qemu/host-utils.h"
+#include "exec/exec-all.h"
 #include "tcg-op.h"
 #include "exec/cpu_ldst.h"
 

diff --git a/target-alpha/vax_helper.c b/target-alpha/vax_helper.c
index e74ac3e042dad28d0d50e549fafa347acafba0cf..2b0c17827438d637ecad63f79f9ee05d8c1ffbe7 100644 (file)
--- a/target-alpha/vax_helper.c
+++ b/target-alpha/vax_helper.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "fpu/softfloat.h"
 

diff --git a/target-arm/arm-powerctl.c b/target-arm/arm-powerctl.c
index ee475d9fab83dc838e73685b2be90880c4b032a5..d452230515d98c2e9daac7c4b2e966b07eb4207e 100644 (file)
--- a/target-arm/arm-powerctl.c
+++ b/target-arm/arm-powerctl.c
@@ -14,6 +14,7 @@
 #include "internals.h"
 #include "arm-powerctl.h"
 #include "qemu/log.h"
+#include "exec/exec-all.h"
 
 #ifndef DEBUG_ARM_POWERCTL
 #define DEBUG_ARM_POWERCTL 0

diff --git a/target-arm/arm_ldst.h b/target-arm/arm_ldst.h
index 35c2c439199ec146dc8908632fce251fc7b9e30c..a76d89f62ce4e2c4324f08300f630b3609db4857 100644 (file)
--- a/target-arm/arm_ldst.h
+++ b/target-arm/arm_ldst.h
@@ -20,6 +20,7 @@
 #ifndef ARM_LDST_H
 #define ARM_LDST_H
 
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 #include "qemu/bswap.h"
 

diff --git a/target-arm/cpu.c b/target-arm/cpu.c
index e48e83acbbf159188abf3dd467f5a95e01729a70..3fd0743cb391eaa236b7869bc55e5018b53ae654 100644 (file)
--- a/target-arm/cpu.c
+++ b/target-arm/cpu.c
@@ -23,6 +23,7 @@
 #include "cpu.h"
 #include "internals.h"
 #include "qemu-common.h"
+#include "exec/exec-all.h"
 #include "hw/qdev-properties.h"
 #if !defined(CONFIG_USER_ONLY)
 #include "hw/loader.h"

diff --git a/target-arm/cpu.h b/target-arm/cpu.h
index 9ff9563d7210d4bd1c538e1bb173504e213b76e1..c741b53ad45f9c86e922497cbea4cca81de7912e 100644 (file)
--- a/target-arm/cpu.h
+++ b/target-arm/cpu.h
@@ -2341,8 +2341,6 @@ static inline void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc,
     *cs_base = 0;
 }
 
-#include "exec/exec-all.h"
-
 enum {
     QEMU_PSCI_CONDUIT_DISABLED = 0,
     QEMU_PSCI_CONDUIT_SMC = 1,

diff --git a/target-arm/helper-a64.c b/target-arm/helper-a64.c
index c7bfb4d8f7218668d827e7fe03afea651ccafaec..7c63556697d09420b4b8b9b9bc1a29f366542a94 100644 (file)
--- a/target-arm/helper-a64.c
+++ b/target-arm/helper-a64.c
@@ -22,6 +22,7 @@
 #include "exec/gdbstub.h"
 #include "exec/helper-proto.h"
 #include "qemu/host-utils.h"
+#include "qemu/log.h"
 #include "sysemu/sysemu.h"
 #include "qemu/bitops.h"
 #include "internals.h"

diff --git a/target-arm/helper.c b/target-arm/helper.c
index d721c0c227864e8f98a16b4d5c6541a970fe791f..e3ea26f8c86bea80ffff153b861a0d8731785599 100644 (file)
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -8,6 +8,7 @@
 #include "sysemu/sysemu.h"
 #include "qemu/bitops.h"
 #include "qemu/crc32c.h"
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 #include "arm_ldst.h"
 #include <zlib.h> /* For crc32 */

diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c
index c7fba8526c72e546d6d6ddf7150240465419edcb..0b29b9dbf2624b3b5b5e1dd9431f1d23b5be771b 100644 (file)
--- a/target-arm/op_helper.c
+++ b/target-arm/op_helper.c
@@ -20,6 +20,7 @@
 #include "cpu.h"
 #include "exec/helper-proto.h"
 #include "internals.h"
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 
 #define SIGNBIT (uint32_t)0x80000000

diff --git a/target-arm/psci.c b/target-arm/psci.c
index 071bbb45db16695f4041d9eb1c6539672f2a6b73..4db9b8ce24032206b64dd05d152e95ab60d8c677 100644 (file)
--- a/target-arm/psci.c
+++ b/target-arm/psci.c
@@ -22,6 +22,7 @@
 #include <sysemu/sysemu.h>
 #include "internals.h"
 #include "arm-powerctl.h"
+#include "exec/exec-all.h"
 
 bool arm_is_psci_call(ARMCPU *cpu, int excp_type)
 {

diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c
index 5526bbda2c249ecff4f8204653d67d7947dbbb1a..ce8141a4429b3f3d8aef7a66d7bf3a68384e69ed 100644 (file)
--- a/target-arm/translate-a64.c
+++ b/target-arm/translate-a64.c
@@ -19,6 +19,7 @@
 #include "qemu/osdep.h"
 
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "tcg-op.h"
 #include "qemu/log.h"
 #include "arm_ldst.h"

diff --git a/target-arm/translate.c b/target-arm/translate.c
index a43b1f61cf77af44ec6cb22d3b499ed8910b05f3..e525f1eb4e60c0bdd8c9379e399114eafb13f254 100644 (file)
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -23,6 +23,7 @@
 #include "cpu.h"
 #include "internals.h"
 #include "disas/disas.h"
+#include "exec/exec-all.h"
 #include "tcg-op.h"
 #include "qemu/log.h"
 #include "qemu/bitops.h"

diff --git a/target-cris/cpu.c b/target-cris/cpu.c
index 1cb79dd9771707af4ea8dd79412e61ad0be00f3b..c5a656bb623bc89df07f879a8baadefbc7505182 100644 (file)
--- a/target-cris/cpu.c
+++ b/target-cris/cpu.c
@@ -26,6 +26,7 @@
 #include "cpu.h"
 #include "qemu-common.h"
 #include "mmu.h"
+#include "exec/exec-all.h"
 
 
 static void cris_cpu_set_pc(CPUState *cs, vaddr value)

diff --git a/target-cris/cpu.h b/target-cris/cpu.h
index 8cc8bf5dd23dbda24270b80e99baf4adc7d7af54..d8c47a6c2e42e5f11e59d795bfd1f1a381ae554b 100644 (file)
--- a/target-cris/cpu.h
+++ b/target-cris/cpu.h
@@ -300,6 +300,4 @@ static inline void cpu_get_tb_cpu_state(CPUCRISState *env, target_ulong *pc,
 #define cpu_list cris_cpu_list
 void cris_cpu_list(FILE *f, fprintf_function cpu_fprintf);
 
-#include "exec/exec-all.h"
-
 #endif

diff --git a/target-cris/helper.c b/target-cris/helper.c
index 1eb9fd91840fe4683b14c568c89bf4defe31691f..af78cca8b9a2a7bf1fc51696d913580dfb590a85 100644 (file)
--- a/target-cris/helper.c
+++ b/target-cris/helper.c
@@ -22,6 +22,7 @@
 #include "cpu.h"
 #include "mmu.h"
 #include "qemu/host-utils.h"
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 
 

diff --git a/target-cris/mmu.c b/target-cris/mmu.c
index 4278d2dce449b0f19ecbf00dc32bc461d7633ab0..b8db9088238db119e14346fbf4e9febe47c4e155 100644 (file)
--- a/target-cris/mmu.c
+++ b/target-cris/mmu.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "mmu.h"
 
 #ifdef DEBUG

diff --git a/target-cris/op_helper.c b/target-cris/op_helper.c
index 320f2b80d24770f1055b5191ed505041fa21c5a5..675ab86d44f5a77aa7dbb1f85b287ebac6f22233 100644 (file)
--- a/target-cris/op_helper.c
+++ b/target-cris/op_helper.c
@@ -23,6 +23,7 @@
 #include "mmu.h"
 #include "exec/helper-proto.h"
 #include "qemu/host-utils.h"
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 
 //#define CRIS_OP_HELPER_DEBUG

diff --git a/target-cris/translate.c b/target-cris/translate.c
index 420051e940634ff3224a74062103c1274d2044d3..2153ea7af6463432ee63f4cf2705bce98ad6e648 100644 (file)
--- a/target-cris/translate.c
+++ b/target-cris/translate.c
@@ -26,6 +26,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "disas/disas.h"
+#include "exec/exec-all.h"
 #include "tcg-op.h"
 #include "exec/helper-proto.h"
 #include "mmu.h"

diff --git a/target-i386/bpt_helper.c b/target-i386/bpt_helper.c
index f47df19988793c52f8346adc7051c4455118632f..499a27756771954bde2776891523b125b8403e4b 100644 (file)
--- a/target-i386/bpt_helper.c
+++ b/target-i386/bpt_helper.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 
 

diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index b6a3caa2144b22919359fb36b9cad79fb553e7cc..05bf5ed2f026594dc04073f526892f0c31012332 100644 (file)
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -20,6 +20,7 @@
 #include "qemu/cutils.h"
 
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "sysemu/kvm.h"
 #include "sysemu/cpus.h"
 #include "kvm_i386.h"

diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index bc8c3fbcbf2b1f979e6afc285675f1cd6667ccb0..5cf2422efb2ba448624eae358727739fb1f0fc61 100644 (file)
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -1362,8 +1362,6 @@ void tcg_x86_init(void);
 #include "hw/i386/apic.h"
 #endif
 
-#include "exec/exec-all.h"
-
 static inline void cpu_get_tb_cpu_state(CPUX86State *env, target_ulong *pc,
                                         target_ulong *cs_base, uint32_t *flags)
 {

diff --git a/target-i386/excp_helper.c b/target-i386/excp_helper.c
index ef37f42401a21746dbfd08b956b1412e7e456ba6..f0dc4996c17a7a9910052e32c244aff81e92a24c 100644 (file)
--- a/target-i386/excp_helper.c
+++ b/target-i386/excp_helper.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "qemu/log.h"
 #include "sysemu/sysemu.h"
 #include "exec/helper-proto.h"

diff --git a/target-i386/fpu_helper.c b/target-i386/fpu_helper.c
index fee5573a10768b97487762bdbb84152bf7f40e51..206e60fdf5f647f868de64dae9b095a8a2386aef 100644 (file)
--- a/target-i386/fpu_helper.c
+++ b/target-i386/fpu_helper.c
@@ -22,6 +22,7 @@
 #include "cpu.h"
 #include "exec/helper-proto.h"
 #include "qemu/host-utils.h"
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 
 #define FPU_RC_MASK         0xc00

diff --git a/target-i386/helper.c b/target-i386/helper.c
index bf3e76207eb39e3ce386b28b7b1fab12c0c03967..889fdab45a4edeb61eedfdf9f712d56ed58917aa 100644 (file)
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "sysemu/kvm.h"
 #include "kvm_i386.h"
 #ifndef CONFIG_USER_ONLY

diff --git a/target-i386/int_helper.c b/target-i386/int_helper.c
index cf5bbb04818a57e86688aae59739751ea4d6a27e..9e873ac150298b2cef0fc8bf31994c7fdfdf47de 100644 (file)
--- a/target-i386/int_helper.c
+++ b/target-i386/int_helper.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "qemu/host-utils.h"
 #include "exec/helper-proto.h"
 

diff --git a/target-i386/machine.c b/target-i386/machine.c
index 658b066da001a6d16033142b7b3386dd294fcf25..cb9adf2b021fb419f467f955a1021e8096e0b8c6 100644 (file)
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -1,13 +1,16 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "hw/hw.h"
 #include "hw/boards.h"
 #include "hw/i386/pc.h"
 #include "hw/isa/isa.h"
 #include "migration/cpu.h"
+#include "exec/exec-all.h"
 
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "sysemu/kvm.h"
 
 #include "qemu/error-report.h"

diff --git a/target-i386/mem_helper.c b/target-i386/mem_helper.c
index 85e75161bc7fbb0c435328013ebb1e42d773b288..c2f4769d4b9ee235daebc35e4ab6e0f1bb2f62ec 100644 (file)
--- a/target-i386/mem_helper.c
+++ b/target-i386/mem_helper.c
@@ -20,6 +20,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 
 /* broken thread support */

diff --git a/target-i386/misc_helper.c b/target-i386/misc_helper.c
index e31ec976a48b526058756bc0bc914de565422cc3..3f666b4b875aac19483ff31bce1552874c545767 100644 (file)
--- a/target-i386/misc_helper.c
+++ b/target-i386/misc_helper.c
@@ -20,6 +20,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 #include "exec/address-spaces.h"
 

diff --git a/target-i386/mpx_helper.c b/target-i386/mpx_helper.c
index 4d1785ecefd86a0dbb1e307bd58e808390d2198b..7e4482065902bbfd3098e4ec0371f95222b13b60 100644 (file)
--- a/target-i386/mpx_helper.c
+++ b/target-i386/mpx_helper.c
@@ -21,6 +21,7 @@
 #include "cpu.h"
 #include "exec/helper-proto.h"
 #include "exec/cpu_ldst.h"
+#include "exec/exec-all.h"
 
 
 void cpu_sync_bndcs_hflags(CPUX86State *env)

diff --git a/target-i386/seg_helper.c b/target-i386/seg_helper.c
index b5f3d72fe352fa08c0eaffc2bb8a86de8c752566..97aee092dc686554c62c253e7e1bc899bda66768 100644 (file)
--- a/target-i386/seg_helper.c
+++ b/target-i386/seg_helper.c
@@ -22,6 +22,7 @@
 #include "cpu.h"
 #include "qemu/log.h"
 #include "exec/helper-proto.h"
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 #include "exec/log.h"
 

diff --git a/target-i386/svm_helper.c b/target-i386/svm_helper.c
index ab472f6eea354fb6ab74fe118c1aa48adf13e075..782b3f12f0ffbd7f92d6ec5b82bc906d5ab183fb 100644 (file)
--- a/target-i386/svm_helper.c
+++ b/target-i386/svm_helper.c
@@ -21,6 +21,7 @@
 #include "cpu.h"
 #include "exec/cpu-all.h"
 #include "exec/helper-proto.h"
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 
 /* Secure Virtual Machine helpers */

diff --git a/target-i386/translate.c b/target-i386/translate.c
index 868c26244ba77dfe64077b4edd3626437d96e297..808546794516cfea35994f8ab5413d86564cc9b0 100644 (file)
--- a/target-i386/translate.c
+++ b/target-i386/translate.c
@@ -21,6 +21,7 @@
 #include "qemu/host-utils.h"
 #include "cpu.h"
 #include "disas/disas.h"
+#include "exec/exec-all.h"
 #include "tcg-op.h"
 #include "exec/cpu_ldst.h"
 

diff --git a/target-lm32/cpu.c b/target-lm32/cpu.c
index 6e7e1b8e6350ff04d36f819bf47c7aac234d0d4c..a783d461dd40efea1924e9004d211673bf830272 100644 (file)
--- a/target-lm32/cpu.c
+++ b/target-lm32/cpu.c
@@ -22,6 +22,7 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "qemu-common.h"
+#include "exec/exec-all.h"
 
 
 static void lm32_cpu_set_pc(CPUState *cs, vaddr value)

diff --git a/target-lm32/cpu.h b/target-lm32/cpu.h
index 2776179659f1ec47addead868448c68d39cfc498..62880f7e4b59f7963660ea7795d285f4c26c2d26 100644 (file)
--- a/target-lm32/cpu.h
+++ b/target-lm32/cpu.h
@@ -273,6 +273,4 @@ static inline void cpu_get_tb_cpu_state(CPULM32State *env, target_ulong *pc,
     *flags = 0;
 }
 
-#include "exec/exec-all.h"
-
 #endif

diff --git a/target-lm32/helper.c b/target-lm32/helper.c
index 655248f81a08b8ca236a650525b76574f706347c..b8f4ed99600a196503d7601925713ffae0766faf 100644 (file)
--- a/target-lm32/helper.c
+++ b/target-lm32/helper.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "qemu/host-utils.h"
 #include "sysemu/sysemu.h"
 #include "exec/semihost.h"

diff --git a/target-lm32/op_helper.c b/target-lm32/op_helper.c
index b6759e02259859d1da8829bc322542735e86cc54..7a550d1c0c4ef8322406d90d5d4834d40f1b3413 100644 (file)
--- a/target-lm32/op_helper.c
+++ b/target-lm32/op_helper.c
@@ -6,6 +6,7 @@
 #include "hw/lm32/lm32_pic.h"
 #include "hw/char/lm32_juart.h"
 
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 
 #ifndef CONFIG_USER_ONLY

diff --git a/target-lm32/translate.c b/target-lm32/translate.c
index dd972f5b8c59e0dfc2dd10914789d9e82c5cd6eb..d09d81447b2dfeb1fe4ebcfc6420bb2b052c5eab 100644 (file)
--- a/target-lm32/translate.c
+++ b/target-lm32/translate.c
@@ -21,6 +21,7 @@
 #include "cpu.h"
 #include "disas/disas.h"
 #include "exec/helper-proto.h"
+#include "exec/exec-all.h"
 #include "tcg-op.h"
 
 #include "exec/cpu_ldst.h"

diff --git a/target-m68k/cpu.c b/target-m68k/cpu.c
index 0b5f9a581e7ab966754f5151eca800b6088dd85c..116b784e6371f839a68b23d21765cb53ea730d6a 100644 (file)
--- a/target-m68k/cpu.c
+++ b/target-m68k/cpu.c
@@ -23,6 +23,7 @@
 #include "cpu.h"
 #include "qemu-common.h"
 #include "migration/vmstate.h"
+#include "exec/exec-all.h"
 
 
 static void m68k_cpu_set_pc(CPUState *cs, vaddr value)

diff --git a/target-m68k/cpu.h b/target-m68k/cpu.h
index 86a1ff0d801191fab31a14d2097f299644234f69..008a057a972f7aa35a99593a05d5f76c5ca16303 100644 (file)
--- a/target-m68k/cpu.h
+++ b/target-m68k/cpu.h
@@ -271,6 +271,4 @@ static inline void cpu_get_tb_cpu_state(CPUM68KState *env, target_ulong *pc,
             | ((env->macsr >> 4) & 0xf);        /* Bits 0-3 */
 }
 
-#include "exec/exec-all.h"
-
 #endif

diff --git a/target-m68k/helper.c b/target-m68k/helper.c
index a8f6d9d6a626094bff9ebcb49537014136106fb9..427cbedfd5e68c0b2299ebeb4d297f9e0ed31441 100644 (file)
--- a/target-m68k/helper.c
+++ b/target-m68k/helper.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "exec/gdbstub.h"
 
 #include "exec/helper-proto.h"

diff --git a/target-m68k/m68k-semi.c b/target-m68k/m68k-semi.c
index f360ef3e17ddde1fd4eb9dd7c598641f38508f2e..1402145c8fb946fe120f745feb32aac46ac8ccc7 100644 (file)
--- a/target-m68k/m68k-semi.c
+++ b/target-m68k/m68k-semi.c
@@ -28,6 +28,7 @@
 #include "exec/gdbstub.h"
 #include "exec/softmmu-semi.h"
 #endif
+#include "qemu/log.h"
 #include "sysemu/sysemu.h"
 
 #define HOSTED_EXIT  0

diff --git a/target-m68k/op_helper.c b/target-m68k/op_helper.c
index 17d0a11914aab1c61a24e0d7ab3d1800689760b3..ff32e354610e035fc8b18212718a57268a286887 100644 (file)
--- a/target-m68k/op_helper.c
+++ b/target-m68k/op_helper.c
@@ -19,6 +19,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 #include "exec/semihost.h"
 

diff --git a/target-m68k/translate.c b/target-m68k/translate.c
index e46356e44c78475728a6f0f7b04458d8e7dfa923..f90187ff96bfc796baa6dfa8275318d74e30bbc2 100644 (file)
--- a/target-m68k/translate.c
+++ b/target-m68k/translate.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "disas/disas.h"
+#include "exec/exec-all.h"
 #include "tcg-op.h"
 #include "qemu/log.h"
 #include "exec/cpu_ldst.h"

diff --git a/target-microblaze/cpu.c b/target-microblaze/cpu.c
index fdfb01917f9a48d3f5ada45f2beba53ddca230cb..8edc00a7963fe975abc8ec4dee48d9cb745e22c5 100644 (file)
--- a/target-microblaze/cpu.c
+++ b/target-microblaze/cpu.c
@@ -27,6 +27,7 @@
 #include "qemu-common.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
+#include "exec/exec-all.h"
 
 static const struct {
     const char *name;

diff --git a/target-microblaze/cpu.h b/target-microblaze/cpu.h
index 98d9c4fa23dc4047d3e2c55901a51a2f9e515b6c..d17cf1e30185bda5e16bb0a87cb6161c937e6d73 100644 (file)
--- a/target-microblaze/cpu.h
+++ b/target-microblaze/cpu.h
@@ -379,6 +379,4 @@ void mb_cpu_unassigned_access(CPUState *cpu, hwaddr addr,
                               unsigned size);
 #endif
 
-#include "exec/exec-all.h"
-
 #endif

diff --git a/target-microblaze/helper.c b/target-microblaze/helper.c
index 4de6bdbf838e1c4b3ea50d4df8c27df034d1893e..da394d1dfc51f19929d0cbf137875a58deed73c3 100644 (file)
--- a/target-microblaze/helper.c
+++ b/target-microblaze/helper.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "qemu/host-utils.h"
 #include "exec/log.h"
 

diff --git a/target-microblaze/mmu.c b/target-microblaze/mmu.c
index 4ac30403573bdde616d81515146f7d5e4883032d..a22a496ebbf98b59667e7d5a5c1d0465cbc88c5a 100644 (file)
--- a/target-microblaze/mmu.c
+++ b/target-microblaze/mmu.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 
 #define D(x)
 

diff --git a/target-microblaze/op_helper.c b/target-microblaze/op_helper.c
index 97333881f0325e6ea6ce38205b533e04116e90d2..0533939389d68a12e0ce4c14c438e689b337f760 100644 (file)
--- a/target-microblaze/op_helper.c
+++ b/target-microblaze/op_helper.c
@@ -22,6 +22,7 @@
 #include "cpu.h"
 #include "exec/helper-proto.h"
 #include "qemu/host-utils.h"
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 
 #define D(x)

diff --git a/target-microblaze/translate.c b/target-microblaze/translate.c
index a7a8ac8f995fd107bb59101d644912c6a40be53d..513f390807a935e01dbf69f34b71720522105ffc 100644 (file)
--- a/target-microblaze/translate.c
+++ b/target-microblaze/translate.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "disas/disas.h"
+#include "exec/exec-all.h"
 #include "tcg-op.h"
 #include "exec/helper-proto.h"
 #include "microblaze-decode.h"

diff --git a/target-mips/cpu.c b/target-mips/cpu.c
index 0e2ecbebec3343f003f086f0d5228b168c1d65d2..64ad112f4de3d666f218dfb1ca857db829c16823 100644 (file)
--- a/target-mips/cpu.c
+++ b/target-mips/cpu.c
@@ -24,6 +24,7 @@
 #include "kvm_mips.h"
 #include "qemu-common.h"
 #include "sysemu/kvm.h"
+#include "exec/exec-all.h"
 
 
 static void mips_cpu_set_pc(CPUState *cs, vaddr value)

diff --git a/target-mips/cpu.h b/target-mips/cpu.h
index 3cacf3787ec400e410e0683ce8c23bf8e299ac07..4ce9d4766171a00bee29b46a7bb258d9adf50b4c 100644 (file)
--- a/target-mips/cpu.h
+++ b/target-mips/cpu.h
@@ -934,8 +934,6 @@ static inline int mips_vp_active(CPUMIPSState *env)
     return 1;
 }
 
-#include "exec/exec-all.h"
-
 static inline void compute_hflags(CPUMIPSState *env)
 {
     env->hflags &= ~(MIPS_HFLAG_COP1X | MIPS_HFLAG_64 | MIPS_HFLAG_CP0 |

diff --git a/target-mips/helper.c b/target-mips/helper.c
index 3bbc72ce87194e82bc3493dfd7712cee87aa6dbc..65fbef0050d1939ec5365153a4e0e32d9a55d0f9 100644 (file)
--- a/target-mips/helper.c
+++ b/target-mips/helper.c
@@ -20,6 +20,7 @@
 
 #include "cpu.h"
 #include "sysemu/kvm.h"
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 #include "exec/log.h"
 

diff --git a/target-mips/mips-semi.c b/target-mips/mips-semi.c
index ed235de99d00f7813123c7b56a757b59910bd633..a7aefbaefc86dd29abbd7ad2be8dba90d06c21f7 100644 (file)
--- a/target-mips/mips-semi.c
+++ b/target-mips/mips-semi.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "qemu/log.h"
 #include "exec/helper-proto.h"
 #include "exec/softmmu-semi.h"
 #include "exec/semihost.h"

diff --git a/target-mips/msa_helper.c b/target-mips/msa_helper.c
index 654a0d2728901533f6f1a36cf1c83acd66bc512d..ae92fcbe28ec94a7515bcc990f5ae0ab70d9558e 100644 (file)
--- a/target-mips/msa_helper.c
+++ b/target-mips/msa_helper.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 
 /* Data format min and max values */

diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
index ba847ab3a02cba5b92d28c494f73caad63a920a1..7cf980748e66d85fca78f56217486eaa5cebf575 100644 (file)
--- a/target-mips/op_helper.c
+++ b/target-mips/op_helper.c
@@ -20,6 +20,7 @@
 #include "cpu.h"
 #include "qemu/host-utils.h"
 #include "exec/helper-proto.h"
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 #include "sysemu/kvm.h"
 

diff --git a/target-mips/translate.c b/target-mips/translate.c
index ddfb9244d7e340769df360a59cc1bd9a00956d37..3bd96aae97125d9b441cfedfe60a6249174c9068 100644 (file)
--- a/target-mips/translate.c
+++ b/target-mips/translate.c
@@ -24,6 +24,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "disas/disas.h"
+#include "exec/exec-all.h"
 #include "tcg-op.h"
 #include "exec/cpu_ldst.h"
 

diff --git a/target-moxie/cpu.c b/target-moxie/cpu.c
index b4ee84e906a11cabd2065cef77b8f151a16345e4..50a08994716cc1241c8de82fe0b1d92dde381df3 100644 (file)
--- a/target-moxie/cpu.c
+++ b/target-moxie/cpu.c
@@ -23,6 +23,7 @@
 #include "qemu-common.h"
 #include "migration/vmstate.h"
 #include "machine.h"
+#include "exec/exec-all.h"
 
 static void moxie_cpu_set_pc(CPUState *cs, vaddr value)
 {

diff --git a/target-moxie/cpu.h b/target-moxie/cpu.h
index 1b46e52c37cd5e7cafd5af0dd7e7aac88cb57e7a..c10898eba7a4355de3bddd80e4f4c5dc81baab20 100644 (file)
--- a/target-moxie/cpu.h
+++ b/target-moxie/cpu.h
@@ -129,7 +129,6 @@ static inline int cpu_mmu_index(CPUMoxieState *env, bool ifetch)
 }
 
 #include "exec/cpu-all.h"
-#include "exec/exec-all.h"
 
 static inline void cpu_get_tb_cpu_state(CPUMoxieState *env, target_ulong *pc,
                                         target_ulong *cs_base, uint32_t *flags)

diff --git a/target-openrisc/cpu.c b/target-openrisc/cpu.c
index ae6ed9e92c68e33ad8a245fbae6031e5642815c8..155913f107953b49c7d809dc980e75cba27e076d 100644 (file)
--- a/target-openrisc/cpu.c
+++ b/target-openrisc/cpu.c
@@ -21,6 +21,7 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "qemu-common.h"
+#include "exec/exec-all.h"
 
 static void openrisc_cpu_set_pc(CPUState *cs, vaddr value)
 {

diff --git a/target-openrisc/cpu.h b/target-openrisc/cpu.h
index ed818af0cf96a98afb848b7999fa9997a710cc22..810a280061b8bc3af280579af0e5d3f25e4b369e 100644 (file)
--- a/target-openrisc/cpu.h
+++ b/target-openrisc/cpu.h
@@ -410,6 +410,4 @@ static inline int cpu_mmu_index(CPUOpenRISCState *env, bool ifetch)
 
 #define CPU_INTERRUPT_TIMER   CPU_INTERRUPT_TGT_INT_0
 
-#include "exec/exec-all.h"
-
 #endif /* CPU_OPENRISC_H */

diff --git a/target-openrisc/exception.c b/target-openrisc/exception.c
index ace3184d500706c9e286942ebf73118c137f35a6..49470be051ee97deeead443445378f23d16f0246 100644 (file)
--- a/target-openrisc/exception.c
+++ b/target-openrisc/exception.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "exception.h"
 
 void QEMU_NORETURN raise_exception(OpenRISCCPU *cpu, uint32_t excp)

diff --git a/target-openrisc/interrupt.c b/target-openrisc/interrupt.c
index 963eb1478223636d7e2ed2280d4615f3de167b35..5fe3f11ffc5935e5386dffe165c0b19378d0566d 100644 (file)
--- a/target-openrisc/interrupt.c
+++ b/target-openrisc/interrupt.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "qemu-common.h"
 #include "exec/gdbstub.h"
 #include "qemu/host-utils.h"

diff --git a/target-openrisc/interrupt_helper.c b/target-openrisc/interrupt_helper.c
index 11b4b2056c197235facafefb1fd624a6f4e679ed..116f9109a77ea294f36717173e0a23775b0931c7 100644 (file)
--- a/target-openrisc/interrupt_helper.c
+++ b/target-openrisc/interrupt_helper.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 
 void HELPER(rfe)(CPUOpenRISCState *env)

diff --git a/target-openrisc/mmu.c b/target-openrisc/mmu.c
index 4ab414a682a9ac6aae1fa647d75c0da8b02a6591..505dcdcdc8d13d8d2d2d3dba0ae01dddd2b0b6e3 100644 (file)
--- a/target-openrisc/mmu.c
+++ b/target-openrisc/mmu.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "qemu-common.h"
 #include "exec/gdbstub.h"
 #include "qemu/host-utils.h"

diff --git a/target-openrisc/mmu_helper.c b/target-openrisc/mmu_helper.c
index d7952d449d90e4cefe45fa7581a1bf70f93e70fb..c0658c386862f6840f1d848e145f04e675834389 100644 (file)
--- a/target-openrisc/mmu_helper.c
+++ b/target-openrisc/mmu_helper.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 
 #ifndef CONFIG_USER_ONLY

diff --git a/target-openrisc/sys_helper.c b/target-openrisc/sys_helper.c
index f917be6beca7bb36fcf5664c58de79e78fad4c7a..a719e452bee4876250916ca636c2ddef153ac698 100644 (file)
--- a/target-openrisc/sys_helper.c
+++ b/target-openrisc/sys_helper.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 
 #define TO_SPR(group, number) (((group) << 11) + (number))

diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index 69b6f29fb16c92ac0a998300d7aab354c1a5c354..cd33539d1ce9dc805cac05c287f0fcff50b9e694 100644 (file)
--- a/target-ppc/cpu.h
+++ b/target-ppc/cpu.h
@@ -2366,8 +2366,6 @@ static inline bool lsw_reg_in_range(int start, int nregs, int rx)
 
 extern void (*cpu_ppc_hypercall)(PowerPCCPU *);
 
-#include "exec/exec-all.h"
-
 void dump_mmu(FILE *f, fprintf_function cpu_fprintf, CPUPPCState *env);
 
 /**

diff --git a/target-ppc/excp_helper.c b/target-ppc/excp_helper.c
index ca4ffe8ad660b9419853cb9286fac32a9f297705..288903ee1d35739927336cc87c3c3bc57c212368 100644 (file)
--- a/target-ppc/excp_helper.c
+++ b/target-ppc/excp_helper.c
@@ -19,6 +19,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 
 #include "helper_regs.h"

diff --git a/target-ppc/int_helper.c b/target-ppc/int_helper.c
index 27b0258d3132355eb9aa57f47c1fd71ff3ede510..74453763d6dd7fca49f612f892473c0ac1d24681 100644 (file)
--- a/target-ppc/int_helper.c
+++ b/target-ppc/int_helper.c
@@ -18,6 +18,7 @@
  */
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "qemu/host-utils.h"
 #include "exec/helper-proto.h"
 #include "crypto/aes.h"

diff --git a/target-ppc/machine.c b/target-ppc/machine.c
index 4911cb71393966a23bb19276b3054f7dc9158567..f6c7256974255ae6a9efbe891ae922ce0b009813 100644 (file)
--- a/target-ppc/machine.c
+++ b/target-ppc/machine.c
@@ -1,12 +1,14 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "hw/hw.h"
 #include "hw/boards.h"
 #include "sysemu/kvm.h"
 #include "helper_regs.h"
 #include "mmu-hash64.h"
 #include "migration/cpu.h"
+#include "exec/exec-all.h"
 
 static int cpu_load_old(QEMUFile *f, void *opaque, int version_id)
 {

diff --git a/target-ppc/mem_helper.c b/target-ppc/mem_helper.c
index 6d584c91268ee204aa44a65622a9bc6eb84e1066..e4de86bc5e4d6552a58a80ea191dc2fd60eb3647 100644 (file)
--- a/target-ppc/mem_helper.c
+++ b/target-ppc/mem_helper.c
@@ -18,10 +18,12 @@
  */
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "qemu/host-utils.h"
 #include "exec/helper-proto.h"
 
 #include "helper_regs.h"
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 
 //#define DEBUG_OP

diff --git a/target-ppc/misc_helper.c b/target-ppc/misc_helper.c
index 73e3b05833ee7f457ef56dbdfccc4ac5af2d78cc..7d41b017c8358e9014ab19d30d0933921752f557 100644 (file)
--- a/target-ppc/misc_helper.c
+++ b/target-ppc/misc_helper.c
@@ -18,6 +18,7 @@
  */
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 
 #include "helper_regs.h"

diff --git a/target-ppc/mmu-hash32.c b/target-ppc/mmu-hash32.c
index 06ce4d69b0d6098b21bdafe572ba7d675e3fa0f6..29bace622aa06f340fc0fc631da758f7207c375b 100644 (file)
--- a/target-ppc/mmu-hash32.c
+++ b/target-ppc/mmu-hash32.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "sysemu/kvm.h"
 #include "kvm_ppc.h"

diff --git a/target-ppc/mmu-hash64.c b/target-ppc/mmu-hash64.c
index 51846264b341fd5d9345ecabba5cbf200f7a53e9..04e6932fa0bd66e87fd4567effd4de591cd4d367 100644 (file)
--- a/target-ppc/mmu-hash64.c
+++ b/target-ppc/mmu-hash64.c
@@ -20,6 +20,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "qemu/error-report.h"
 #include "sysemu/kvm.h"

diff --git a/target-ppc/mmu_helper.c b/target-ppc/mmu_helper.c
index ff217941b5a77ad09ed9e37b0ffc6f1e8291f27f..2e0e3ca92cf88b64a73ae03650bb29670afddf07 100644 (file)
--- a/target-ppc/mmu_helper.c
+++ b/target-ppc/mmu_helper.c
@@ -24,6 +24,7 @@
 #include "kvm_ppc.h"
 #include "mmu-hash64.h"
 #include "mmu-hash32.h"
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 #include "exec/log.h"
 

diff --git a/target-ppc/timebase_helper.c b/target-ppc/timebase_helper.c
index 3b340d70d1934a7c866193cef9f00de0747cdbab..66de3137e467c7d67aad201493295c82d9d9bf38 100644 (file)
--- a/target-ppc/timebase_helper.c
+++ b/target-ppc/timebase_helper.c
@@ -19,6 +19,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
+#include "qemu/log.h"
 
 /*****************************************************************************/
 /* SPR accesses */

diff --git a/target-ppc/translate.c b/target-ppc/translate.c
index d485d7c7cb181b065eb4a40f5c7e8ccb4df9f496..745f4de98f18d12ff6d2cf1362b6a9cc7e4806f5 100644 (file)
--- a/target-ppc/translate.c
+++ b/target-ppc/translate.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "disas/disas.h"
+#include "exec/exec-all.h"
 #include "tcg-op.h"
 #include "qemu/host-utils.h"
 #include "exec/cpu_ldst.h"

diff --git a/target-s390x/cc_helper.c b/target-s390x/cc_helper.c
index 0d9411bdf3e5f5383bc7910577ae3b7dc9b0da6a..1cf855133e31682da0a608aea555555af70f91c6 100644 (file)
--- a/target-s390x/cc_helper.c
+++ b/target-s390x/cc_helper.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "qemu/host-utils.h"
 

diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c
index e6651654f36628dbf4c0a7bd7f6469a9de15a670..e43e2d61550be09a754ff06f209577cddc8f52e0 100644 (file)
--- a/target-s390x/cpu.c
+++ b/target-s390x/cpu.c
@@ -33,6 +33,7 @@
 #include "trace.h"
 #include "qapi/visitor.h"
 #include "migration/vmstate.h"
+#include "exec/exec-all.h"
 #ifndef CONFIG_USER_ONLY
 #include "hw/hw.h"
 #include "sysemu/arch_init.h"

diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h
index 15fb6dba2e87b94fa3ba8af659a0dc11e71202ca..bd6b2e57ef6c20f19330fb23672723144bef48b7 100644 (file)
--- a/target-s390x/cpu.h
+++ b/target-s390x/cpu.h
@@ -633,8 +633,6 @@ extern void subsystem_reset(void);
 void s390_cpu_list(FILE *f, fprintf_function cpu_fprintf);
 #define cpu_list s390_cpu_list
 
-#include "exec/exec-all.h"
-
 #define EXCP_EXT 1 /* external interrupt */
 #define EXCP_SVC 2 /* supervisor call (syscall) */
 #define EXCP_PGM 3 /* program interruption */

diff --git a/target-s390x/fpu_helper.c b/target-s390x/fpu_helper.c
index 1c7f67354286ff1fd6290bc85279c9bd868a94d8..4ddb3883926dae29e257136851b2495d3f03a466 100644 (file)
--- a/target-s390x/fpu_helper.c
+++ b/target-s390x/fpu_helper.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 #include "exec/helper-proto.h"
 

diff --git a/target-s390x/gdbstub.c b/target-s390x/gdbstub.c
index 0992ae722b871afcf6a7b719236559932e1851df..3d223dec978bbb6582c201ff2501e84341c8c256 100644 (file)
--- a/target-s390x/gdbstub.c
+++ b/target-s390x/gdbstub.c
@@ -20,6 +20,7 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "exec/gdbstub.h"
 #include "qemu/bitops.h"
 

diff --git a/target-s390x/helper.c b/target-s390x/helper.c
index 423dd726500345c5628a2644965cbe18fcd2625e..ad8f7978ea31002e3548aa972f73e50a9f8aa304 100644 (file)
--- a/target-s390x/helper.c
+++ b/target-s390x/helper.c
@@ -23,6 +23,7 @@
 #include "cpu.h"
 #include "exec/gdbstub.h"
 #include "qemu/timer.h"
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 #include "hw/s390x/ioinst.h"
 #ifndef CONFIG_USER_ONLY

diff --git a/target-s390x/int_helper.c b/target-s390x/int_helper.c
index cc1071eeaf90dfaa66a6b843a03ae7d671c74eed..370c94da55e30050c9dc906a6d32c482c6f98d9c 100644 (file)
--- a/target-s390x/int_helper.c
+++ b/target-s390x/int_helper.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "qemu/host-utils.h"
 #include "exec/helper-proto.h"
 

diff --git a/target-s390x/mem_helper.c b/target-s390x/mem_helper.c
index 9d206a92cf34986efc65e9b5f201f77176838cb1..ec8059a264517d823acf0e1ecbc51701c070fa51 100644 (file)
--- a/target-s390x/mem_helper.c
+++ b/target-s390x/mem_helper.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 
 #if !defined(CONFIG_USER_ONLY)

diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c
index 93280d02697a8f0151e363969f436c511ab35885..86da1947b9841f445473e59fcea47bc7acd8fc72 100644 (file)
--- a/target-s390x/misc_helper.c
+++ b/target-s390x/misc_helper.c
@@ -29,6 +29,7 @@
 #ifdef CONFIG_KVM
 #include <linux/kvm.h>
 #endif
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 
 #if !defined(CONFIG_USER_ONLY)

diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index e99eb5cb01699d5b7e43d08ec23ad8e0df175b4e..2bbd1020c9d6f0f0943d799fd3b8ec729c0ee361 100644 (file)
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -31,6 +31,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "disas/disas.h"
+#include "exec/exec-all.h"
 #include "tcg-op.h"
 #include "qemu/log.h"
 #include "qemu/host-utils.h"

diff --git a/target-sh4/cpu.c b/target-sh4/cpu.c
index 86ba38808b981040b8fa088c8f57488ee456a031..794b625d8e560cdd411e866f2c0cf06273759bae 100644 (file)
--- a/target-sh4/cpu.c
+++ b/target-sh4/cpu.c
@@ -24,6 +24,7 @@
 #include "cpu.h"
 #include "qemu-common.h"
 #include "migration/vmstate.h"
+#include "exec/exec-all.h"
 
 
 static void superh_cpu_set_pc(CPUState *cs, vaddr value)

diff --git a/target-sh4/cpu.h b/target-sh4/cpu.h
index 9bd15b8f92a51b8e321721fa356d6a641377e0a0..3f5c689eb3fefadbbcca4afbd3bd926d1b9bdf59 100644 (file)
--- a/target-sh4/cpu.h
+++ b/target-sh4/cpu.h
@@ -389,6 +389,4 @@ static inline void cpu_get_tb_cpu_state(CPUSH4State *env, target_ulong *pc,
             | (env->movcal_backup ? TB_FLAG_PENDING_MOVCA : 0); /* Bit 4 */
 }
 
-#include "exec/exec-all.h"
-
 #endif                         /* _CPU_SH4_H */

diff --git a/target-sh4/helper.c b/target-sh4/helper.c
index 6438338f249be06a9d153908aca99938f5dc68ee..a33ac697c5ff47630eeab2edb6ec459d048d025e 100644 (file)
--- a/target-sh4/helper.c
+++ b/target-sh4/helper.c
@@ -19,6 +19,7 @@
 #include "qemu/osdep.h"
 
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "exec/log.h"
 
 #if !defined(CONFIG_USER_ONLY)

diff --git a/target-sh4/op_helper.c b/target-sh4/op_helper.c
index 368e687d68577c8a66dd716b71e89bca9d9e4b44..303e83e7e51216833de80f692aee7353727ae23d 100644 (file)
--- a/target-sh4/op_helper.c
+++ b/target-sh4/op_helper.c
@@ -19,6 +19,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 
 #ifndef CONFIG_USER_ONLY

diff --git a/target-sh4/translate.c b/target-sh4/translate.c
index 53f782c05467f17e24e09119abc9054e4599d5df..ff5222b04e89e1837dbaf0e9fae53d34dcfea57e 100644 (file)
--- a/target-sh4/translate.c
+++ b/target-sh4/translate.c
@@ -22,6 +22,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "disas/disas.h"
+#include "exec/exec-all.h"
 #include "tcg-op.h"
 #include "exec/cpu_ldst.h"
 

diff --git a/target-sparc/cpu.c b/target-sparc/cpu.c
index fe4119e2bc93661338244a3ff65d62b3efe78511..5b74cfcd3117e92ebce23dab082ea87bbbe3063e 100644 (file)
--- a/target-sparc/cpu.c
+++ b/target-sparc/cpu.c
@@ -21,6 +21,7 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "qemu/error-report.h"
+#include "exec/exec-all.h"
 
 //#define DEBUG_FEATURES
 

diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h
index 0141994f2dcd75e1b5aa15e23900bd904d92aa3a..ba37f4b94e38447163eb1be68c2fd0956163caca 100644 (file)
--- a/target-sparc/cpu.h
+++ b/target-sparc/cpu.h
@@ -768,6 +768,4 @@ static inline bool tb_am_enabled(int tb_flags)
 #endif
 }
 
-#include "exec/exec-all.h"
-
 #endif

diff --git a/target-sparc/helper.c b/target-sparc/helper.c
index 8349cbe2cc3f757f65bd464e9677d8c8fdcddf7c..bedc6722a1867a65d5464d76ba177e0debeba65a 100644 (file)
--- a/target-sparc/helper.c
+++ b/target-sparc/helper.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "qemu/host-utils.h"
 #include "exec/helper-proto.h"
 #include "sysemu/sysemu.h"

diff --git a/target-sparc/ldst_helper.c b/target-sparc/ldst_helper.c
index 658e7d8585e28399455ebee5658cf0d3a4d6e6b7..f73cf6deaa1f87a6ff541c99c5f30026cac79fdd 100644 (file)
--- a/target-sparc/ldst_helper.c
+++ b/target-sparc/ldst_helper.c
@@ -20,6 +20,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 
 //#define DEBUG_MMU

diff --git a/target-sparc/machine.c b/target-sparc/machine.c
index c8823af951db27ab0dc8631d8c7c8376f2a496f1..59c92f75828588d34a4d837d26e432d230c28eac 100644 (file)
--- a/target-sparc/machine.c
+++ b/target-sparc/machine.c
@@ -1,12 +1,15 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "hw/hw.h"
 #include "hw/boards.h"
 #include "qemu/timer.h"
 
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "migration/cpu.h"
+#include "exec/exec-all.h"
 
 #ifdef TARGET_SPARC64
 static const VMStateDescription vmstate_cpu_timer = {

diff --git a/target-sparc/mmu_helper.c b/target-sparc/mmu_helper.c
index aa80c4829b299f5912b2add1e866da3501f41116..32b629fb0d270751cc3781a7cc538dff57f5d8aa 100644 (file)
--- a/target-sparc/mmu_helper.c
+++ b/target-sparc/mmu_helper.c
@@ -19,6 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "trace.h"
 #include "exec/address-spaces.h"
 

diff --git a/target-sparc/translate.c b/target-sparc/translate.c
index d154e3f7b633f4f0c9d897c28a0add3c41d9f4d0..21760b9fea3e3fdf3dd21261aab4ff2ae8b87143 100644 (file)
--- a/target-sparc/translate.c
+++ b/target-sparc/translate.c
@@ -23,6 +23,7 @@
 #include "cpu.h"
 #include "disas/disas.h"
 #include "exec/helper-proto.h"
+#include "exec/exec-all.h"
 #include "tcg-op.h"
 #include "exec/cpu_ldst.h"
 

diff --git a/target-tilegx/cpu.c b/target-tilegx/cpu.c
index d2d09120348addb3e783e7c270224f9444f4776f..7017cb6e1a7f0486de8bc23788fc092bb46df39d 100644 (file)
--- a/target-tilegx/cpu.c
+++ b/target-tilegx/cpu.c
@@ -25,6 +25,7 @@
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "linux-user/syscall_defs.h"
+#include "exec/exec-all.h"
 
 static void tilegx_cpu_dump_state(CPUState *cs, FILE *f,
                                   fprintf_function cpu_fprintf, int flags)

diff --git a/target-tilegx/cpu.h b/target-tilegx/cpu.h
index c9dda127c94c9c89f29c252290f2ba8b67cb05b6..b9b588de5396e5248b6bd111bb5e9282780b713b 100644 (file)
--- a/target-tilegx/cpu.h
+++ b/target-tilegx/cpu.h
@@ -176,6 +176,4 @@ static inline void cpu_get_tb_cpu_state(CPUTLGState *env, target_ulong *pc,
     *flags = 0;
 }
 
-#include "exec/exec-all.h"
-
 #endif

diff --git a/target-tilegx/helper.c b/target-tilegx/helper.c
index 616c5c7cfa98a6f1626a46803d57b0251e2f03e8..b4fba9cc211b5b584bae26a90ceace35be123b0f 100644 (file)
--- a/target-tilegx/helper.c
+++ b/target-tilegx/helper.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "qemu-common.h"
 #include "exec/helper-proto.h"
 #include <zlib.h> /* For crc32 */

diff --git a/target-tilegx/translate.c b/target-tilegx/translate.c
index 03918ebd5d4a5a4b2fe961a7aa8f7ef7e014a40b..bdea673e5b2b85c4c5f7c1ff02d2b792bbb22e94 100644 (file)
--- a/target-tilegx/translate.c
+++ b/target-tilegx/translate.c
@@ -23,6 +23,7 @@
 #include "qemu/log.h"
 #include "exec/log.h"
 #include "disas/disas.h"
+#include "exec/exec-all.h"
 #include "tcg-op.h"
 #include "exec/cpu_ldst.h"
 #include "linux-user/syscall_defs.h"

diff --git a/target-tricore/cpu.c b/target-tricore/cpu.c
index 69fca8c068d170d15f703fd630dcccbd04109279..35d4ee4deacc50be51fa4a458206711885273a90 100644 (file)
--- a/target-tricore/cpu.c
+++ b/target-tricore/cpu.c
@@ -21,6 +21,7 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "qemu-common.h"
+#include "exec/exec-all.h"
 
 static inline void set_feature(CPUTriCoreState *env, int feature)
 {

diff --git a/target-tricore/cpu.h b/target-tricore/cpu.h
index a48340f1868a010a70ffc7d48759cac7d894f3e8..3c6f7b75b8ca454d3d8ec73a084476024c6d5ebf 100644 (file)
--- a/target-tricore/cpu.h
+++ b/target-tricore/cpu.h
@@ -422,6 +422,4 @@ int cpu_tricore_handle_mmu_fault(CPUState *cpu, target_ulong address,
                                  int rw, int mmu_idx);
 #define cpu_handle_mmu_fault cpu_tricore_handle_mmu_fault
 
-#include "exec/exec-all.h"
-
 #endif /*__TRICORE_CPU_H__ */

diff --git a/target-tricore/helper.c b/target-tricore/helper.c
index 71b31cdb9bd340c834aae8a1a19e0fdb82cb9b53..3118905eca055c72380369553d9f5d382396a082 100644 (file)
--- a/target-tricore/helper.c
+++ b/target-tricore/helper.c
@@ -18,6 +18,7 @@
 #include "qemu/osdep.h"
 
 #include "cpu.h"
+#include "exec/exec-all.h"
 
 enum {
     TLBRET_DIRTY = -4,

diff --git a/target-tricore/op_helper.c b/target-tricore/op_helper.c
index 40656c357ca139dd3a0613778abc9314e8368276..a73ed530f6255302a2bfab0ab6de46994a2e929c 100644 (file)
--- a/target-tricore/op_helper.c
+++ b/target-tricore/op_helper.c
@@ -18,6 +18,7 @@
 #include "cpu.h"
 #include "qemu/host-utils.h"
 #include "exec/helper-proto.h"
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 #include <zlib.h> /* for crc32 */
 

diff --git a/target-tricore/translate.c b/target-tricore/translate.c
index 2d17aebaa31d49e5e989d67828e722ce4a8f4b58..83fa4fcd54b51f83e55e09dd99736a706595952b 100644 (file)
--- a/target-tricore/translate.c
+++ b/target-tricore/translate.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "disas/disas.h"
+#include "exec/exec-all.h"
 #include "tcg-op.h"
 #include "exec/cpu_ldst.h"
 

diff --git a/target-unicore32/cpu.c b/target-unicore32/cpu.c
index 66f43acfff84626adce0a657da7b5d83c447138f..3990433eb8e86c5bcaa4f28bb310566886fa407c 100644 (file)
--- a/target-unicore32/cpu.c
+++ b/target-unicore32/cpu.c
@@ -17,6 +17,7 @@
 #include "cpu.h"
 #include "qemu-common.h"
 #include "migration/vmstate.h"
+#include "exec/exec-all.h"
 
 static void uc32_cpu_set_pc(CPUState *cs, vaddr value)
 {

diff --git a/target-unicore32/cpu.h b/target-unicore32/cpu.h
index 7099509b4a621080e19123825ecb85551c12153d..f3e877bbc0b4145aa0ec4bf7c356b44460c34107 100644 (file)
--- a/target-unicore32/cpu.h
+++ b/target-unicore32/cpu.h
@@ -164,7 +164,6 @@ static inline int cpu_mmu_index(CPUUniCore32State *env, bool ifetch)
 }
 
 #include "exec/cpu-all.h"
-#include "exec/exec-all.h"
 
 int uc32_cpu_exec(CPUState *s);
 

diff --git a/target-unicore32/helper.c b/target-unicore32/helper.c
index 21f5f35744c7b7f0a303a6e0b5ff129e9780c239..d603bde2379a34f8d348079ef7debb7bf4f430b3 100644 (file)
--- a/target-unicore32/helper.c
+++ b/target-unicore32/helper.c
@@ -11,6 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "exec/gdbstub.h"
 #include "exec/helper-proto.h"
 #include "qemu/host-utils.h"

diff --git a/target-unicore32/op_helper.c b/target-unicore32/op_helper.c
index f5847307a3d001c8f7cc4b5e23214838d1bdbb88..a782d33843f67148a7b49e68054ab171c90959e1 100644 (file)
--- a/target-unicore32/op_helper.c
+++ b/target-unicore32/op_helper.c
@@ -11,6 +11,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 
 #define SIGNBIT (uint32_t)0x80000000

diff --git a/target-unicore32/softmmu.c b/target-unicore32/softmmu.c
index d267fed8758b8dc6bc050fc5ae5ee4a94ee4b2f3..a34026a524556272f8cbd909fb4c36acc0a6d152 100644 (file)
--- a/target-unicore32/softmmu.c
+++ b/target-unicore32/softmmu.c
@@ -14,6 +14,7 @@
 
 #include "qemu/osdep.h"
 #include <cpu.h>
+#include "exec/exec-all.h"
 
 #undef DEBUG_UC32
 

diff --git a/target-unicore32/translate.c b/target-unicore32/translate.c
index 307f7b205924ae5225a3c8475959e483a438c8af..b04d22c9fbc3df5bf0591fbdd44abd4f5adc8548 100644 (file)
--- a/target-unicore32/translate.c
+++ b/target-unicore32/translate.c
@@ -12,6 +12,7 @@
 
 #include "cpu.h"
 #include "disas/disas.h"
+#include "exec/exec-all.h"
 #include "tcg-op.h"
 #include "qemu/log.h"
 #include "exec/cpu_ldst.h"

diff --git a/target-xtensa/cpu.c b/target-xtensa/cpu.c
index 01b251fdc7ff48c5d87c803a12d61390a4c1202d..5ad08a2799906a9ecf2457c948fc4364ac904e74 100644 (file)
--- a/target-xtensa/cpu.c
+++ b/target-xtensa/cpu.c
@@ -33,6 +33,7 @@
 #include "cpu.h"
 #include "qemu-common.h"
 #include "migration/vmstate.h"
+#include "exec/exec-all.h"
 
 
 static void xtensa_cpu_set_pc(CPUState *cs, vaddr value)

diff --git a/target-xtensa/cpu.h b/target-xtensa/cpu.h
index e47cb6b45a1d8a93d865272abf02284b4adb1ae1..442176a2b26867eed6f85b9b8cb88d4d567a6274 100644 (file)
--- a/target-xtensa/cpu.h
+++ b/target-xtensa/cpu.h
@@ -584,6 +584,5 @@ static inline void cpu_get_tb_cpu_state(CPUXtensaState *env, target_ulong *pc,
 }
 
 #include "exec/cpu-all.h"
-#include "exec/exec-all.h"
 
 #endif

diff --git a/target-xtensa/gdbstub.c b/target-xtensa/gdbstub.c
index bfcd591409e589b6350c7415c08e49dbc61f0d0a..fa5469a4ef5f5b6053ea377b379f48ac0770d02d 100644 (file)
--- a/target-xtensa/gdbstub.c
+++ b/target-xtensa/gdbstub.c
@@ -21,6 +21,7 @@
 #include "qemu-common.h"
 #include "cpu.h"
 #include "exec/gdbstub.h"
+#include "qemu/log.h"
 
 int xtensa_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n)
 {

diff --git a/target-xtensa/op_helper.c b/target-xtensa/op_helper.c
index 62fa33d8d4e95fcccb36ebe65303a600925b3d21..bc3667f0ab8148254f8a3b567d08bd769c0fbf28 100644 (file)
--- a/target-xtensa/op_helper.c
+++ b/target-xtensa/op_helper.c
@@ -29,6 +29,7 @@
 #include "cpu.h"
 #include "exec/helper-proto.h"
 #include "qemu/host-utils.h"
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 #include "exec/address-spaces.h"
 #include "qemu/timer.h"

diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c
index 9eac56e2a5bc42909e1d75f5f133ac7fafcf8bbd..67efb32ef33aaf84388e7d458a02009a854e3fd6 100644 (file)
--- a/target-xtensa/translate.c
+++ b/target-xtensa/translate.c
@@ -36,6 +36,7 @@
 #include "tcg-op.h"
 #include "qemu/log.h"
 #include "sysemu/sysemu.h"
+#include "exec/exec-all.h"
 #include "exec/cpu_ldst.h"
 #include "exec/semihost.h"
 

diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index 7a159142e66560fcfa14624e235f08c22dc4ad75..54c02777c51729a33a96875638f29b5ea78048dc 100644 (file)
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "cpu.h"
+#include "exec/exec-all.h"
 #include "tcg.h"
 #include "tcg-op.h"
 

diff --git a/tcg/tcg.c b/tcg/tcg.c
index 796addd1fc762b15c762f9c82069a225655ffd2d..254427b1b7e0d1d7a66b01fe351cf6c574116c89 100644 (file)
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -41,6 +41,11 @@
 #define NO_CPU_IO_DEFS
 #include "cpu.h"
 
+#include "qemu/host-utils.h"
+#include "qemu/timer.h"
+#include "exec/cpu-common.h"
+#include "exec/exec-all.h"
+
 #include "tcg-op.h"
 
 #if UINTPTR_MAX == UINT32_MAX

diff --git a/translate-all.c b/translate-all.c
index b54f47253122fa64fed822f0393cb0051e211c11..1c1c85530af600f5cf08c1bb95f8d048aa7a58c3 100644 (file)
--- a/translate-all.c
+++ b/translate-all.c
@@ -29,6 +29,7 @@
 #include "cpu.h"
 #include "trace.h"
 #include "disas/disas.h"
+#include "exec/exec-all.h"
 #include "tcg.h"
 #if defined(CONFIG_USER_ONLY)
 #include "qemu.h"

diff --git a/user-exec.c b/user-exec.c
index d8d597bafea11adc873e526026bdc2bd4d53c997..c809daaa87a02036b3140e3ed0bb2da9ee7d32e1 100644 (file)
--- a/user-exec.c
+++ b/user-exec.c
@@ -19,6 +19,7 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "disas/disas.h"
+#include "exec/exec-all.h"
 #include "tcg.h"
 #include "qemu/bitops.h"
 #include "exec/cpu_ldst.h"