target: Do not include "exec/exec-all.h" if it is not necessary

Code change produced with:
    $ git grep '#include "exec/exec-all.h"' | \
      cut -d: -f-1 | \
      xargs egrep -L "(cpu_address_space_init|cpu_loop_|tlb_|tb_|GETPC|singlestep|TranslationBlock)" | \
      xargs sed -i.bak '/#include "exec\/exec-all.h"/d'

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180528232719.4721-10-f4bug@amsat.org>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

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

diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c
index fc962c5fbcfa1442732e50eb990bc362f76085f7..70f6f26a94b0856b606a0422409670d952cf9c0a 100644 (file)
--- a/hw/i386/kvmvapic.c
+++ b/hw/i386/kvmvapic.c
@@ -11,7 +11,6 @@
 #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/hw_accel.h"

diff --git a/target/arm/arm-powerctl.c b/target/arm/arm-powerctl.c
index 25207cb850c2d9464e7b2da3dd3b415f936a317a..ce55eeb682bb622a3b73795cee1111360b7de5e2 100644 (file)
--- a/target/arm/arm-powerctl.c
+++ b/target/arm/arm-powerctl.c
@@ -15,7 +15,6 @@
 #include "arm-powerctl.h"
 #include "qemu/log.h"
 #include "qemu/main-loop.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 01587b3ebb8873e1fb111587b4fb03fadff6417e..5e0ac8bef0607ae841cba66d21f4c4af085cfb9f 100644 (file)
--- a/target/arm/arm_ldst.h
+++ b/target/arm/arm_ldst.h
@@ -20,7 +20,6 @@
 #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/crypto_helper.c b/target/arm/crypto_helper.c
index cc339ea7e0ca21afb6e96ca287f44339cda11130..f800266727525911a2742c96c982d9b4a70dc2d8 100644 (file)
--- a/target/arm/crypto_helper.c
+++ b/target/arm/crypto_helper.c
@@ -12,7 +12,6 @@
 #include "qemu/osdep.h"
 
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "crypto/aes.h"
 

diff --git a/target/arm/iwmmxt_helper.c b/target/arm/iwmmxt_helper.c
index 7d87e1a0a8af212c3201bcc740847e18623a18d9..f6a4fc5b7f0b29a558cd8e3b68ce4bc7c75cce1f 100644 (file)
--- a/target/arm/iwmmxt_helper.c
+++ b/target/arm/iwmmxt_helper.c
@@ -22,7 +22,6 @@
 #include "qemu/osdep.h"
 
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 
 /* iwMMXt macros extracted from GNU gdb.  */

diff --git a/target/arm/neon_helper.c b/target/arm/neon_helper.c
index a1ec6537eb7b9ed23c2fd2ffffa57f480d0ba9e5..c2c6491a83e777bd02c0132ae89bb91f91983a8e 100644 (file)
--- a/target/arm/neon_helper.c
+++ b/target/arm/neon_helper.c
@@ -9,7 +9,6 @@
 #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/psci.c b/target/arm/psci.c
index eb7b88e9265b023b3b599df640357df2ab1ea81e..a74d78802ab7082bb7044b14c4be63ecd4375703 100644 (file)
--- a/target/arm/psci.c
+++ b/target/arm/psci.c
@@ -22,7 +22,6 @@
 #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/vec_helper.c b/target/arm/vec_helper.c
index ec705cfca5ec8f29debc58fa7aef3aa495dab900..25e209da3149fd4834fa9ce0e4e351730325c1d2 100644 (file)
--- a/target/arm/vec_helper.c
+++ b/target/arm/vec_helper.c
@@ -19,7 +19,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "tcg/tcg-gvec-desc.h"
 #include "fpu/softfloat.h"

diff --git a/target/cris/cpu.c b/target/cris/cpu.c
index db8d0884a1d8ad67667396c002cf6b57155e7c13..a23aba2688828511866cb95957e1daf9102d325b 100644 (file)
--- a/target/cris/cpu.c
+++ b/target/cris/cpu.c
@@ -26,7 +26,6 @@
 #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/hppa/helper.c b/target/hppa/helper.c
index 858ec205b69fb892c1bbe09f19b7c51a207595b6..6539061e525ceffc2564228de0a19e9c1fb3e853 100644 (file)
--- a/target/hppa/helper.c
+++ b/target/hppa/helper.c
@@ -20,7 +20,6 @@
 #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/hppa/int_helper.c b/target/hppa/int_helper.c
index 561bf6eb609a8fa4943bb7aabf72a29b1e95951d..8d5edd3a2063d10596ee1358e3a29eb231a275da 100644 (file)
--- a/target/hppa/int_helper.c
+++ b/target/hppa/int_helper.c
@@ -21,7 +21,6 @@
 #include "qemu/main-loop.h"
 #include "qemu/log.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/helper-proto.h"
 #include "qom/cpu.h"
 

diff --git a/target/i386/hax-all.c b/target/i386/hax-all.c
index c5856bbdc384cdfb84d3e67a78d008c577a9f776..d2e512856bb816c02d6a95322e3f229f794184b4 100644 (file)
--- a/target/i386/hax-all.c
+++ b/target/i386/hax-all.c
@@ -26,7 +26,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/address-spaces.h"
-#include "exec/exec-all.h"
 
 #include "qemu-common.h"
 #include "hax-i386.h"

diff --git a/target/i386/hax-mem.c b/target/i386/hax-mem.c
index f46e85544deb2d7a1fa49bd8c6f4867e9e42a081..5c37e94caaf9fc55b22dbc1d9f7f614e124fb81d 100644 (file)
--- a/target/i386/hax-mem.c
+++ b/target/i386/hax-mem.c
@@ -11,7 +11,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/address-spaces.h"
-#include "exec/exec-all.h"
 #include "qemu/error-report.h"
 
 #include "target/i386/hax-i386.h"

diff --git a/target/i386/hax-windows.c b/target/i386/hax-windows.c
index b1ac737ae40b702b8eb8d406aa2975599de8f37a..5729ad9b485a1ca1ea22d07a1ac605f1c1c04e74 100644 (file)
--- a/target/i386/hax-windows.c
+++ b/target/i386/hax-windows.c
@@ -12,7 +12,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "hax-i386.h"
 
 /*

diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c
index f6c872e6784fb6186aa63dd185c592f5a4a93ea3..df69e6d0a7af26ed2ea773b943c730334dff3787 100644 (file)
--- a/target/i386/hvf/hvf.c
+++ b/target/i386/hvf/hvf.c
@@ -65,7 +65,6 @@
 #include <Hypervisor/hv_vmx.h>
 
 #include "exec/address-spaces.h"
-#include "exec/exec-all.h"
 #include "hw/i386/apic_internal.h"
 #include "hw/boards.h"
 #include "qemu/main-loop.h"

diff --git a/target/i386/hvf/x86_task.c b/target/i386/hvf/x86_task.c
index 7610d858020d1853a0361858ae357137fe9c3443..7099335e89839ab412818a923188ed281f6d0b96 100644 (file)
--- a/target/i386/hvf/x86_task.c
+++ b/target/i386/hvf/x86_task.c
@@ -26,7 +26,6 @@
 #include <Hypervisor/hv.h>
 #include <Hypervisor/hv_vmx.h>
 
-#include "exec/exec-all.h"
 #include "hw/i386/apic_internal.h"
 #include "hw/boards.h"
 #include "qemu/main-loop.h"

diff --git a/target/i386/whpx-all.c b/target/i386/whpx-all.c
index 58435178a4a99f3310de3120b941f9da947ccf75..bd7df10ba5b6d2192af990a0a1981138a3310328 100644 (file)
--- a/target/i386/whpx-all.c
+++ b/target/i386/whpx-all.c
@@ -11,7 +11,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "exec/address-spaces.h"
-#include "exec/exec-all.h"
 #include "exec/ioport.h"
 #include "qemu-common.h"
 #include "strings.h"

diff --git a/target/lm32/cpu.c b/target/lm32/cpu.c
index 000315246962be310d559a1084b706ba048a5c34..b7499cb62773a1e08803e87a0d0a7ee79d874f92 100644 (file)
--- a/target/lm32/cpu.c
+++ b/target/lm32/cpu.c
@@ -22,7 +22,6 @@
 #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/m68k/cpu.c b/target/m68k/cpu.c
index a4ed8770aaca362e797189b62f0faea40f51e1ac..582e3a73b3705c19283fcab9646c40033c254202 100644 (file)
--- a/target/m68k/cpu.c
+++ b/target/m68k/cpu.c
@@ -23,7 +23,6 @@
 #include "cpu.h"
 #include "qemu-common.h"
 #include "migration/vmstate.h"
-#include "exec/exec-all.h"
 #include "fpu/softfloat.h"
 
 static void m68k_cpu_set_pc(CPUState *cs, vaddr value)

diff --git a/target/moxie/cpu.c b/target/moxie/cpu.c
index 4170284da62207361af1ea6a0f17c23574f94d89..8d67eb67273b14e8798769620cb32648de0dfacb 100644 (file)
--- a/target/moxie/cpu.c
+++ b/target/moxie/cpu.c
@@ -23,7 +23,6 @@
 #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/mmu.c b/target/moxie/mmu.c
index 9203330b3b0f28010dfe8f8bd48094cc054e54e3..bd90b1eebc753e9069c2ba64cfe0276eba134151 100644 (file)
--- a/target/moxie/mmu.c
+++ b/target/moxie/mmu.c
@@ -21,7 +21,6 @@
 
 #include "cpu.h"
 #include "mmu.h"
-#include "exec/exec-all.h"
 
 int moxie_mmu_translate(MoxieMMUResult *res,
                        CPUMoxieState *env, uint32_t vaddr,

diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c
index 20b115afae8def3ca74f1525bf4f93717de75169..a692a98ec05c4b024446252514b2bdd7aedc137f 100644 (file)
--- a/target/openrisc/cpu.c
+++ b/target/openrisc/cpu.c
@@ -21,7 +21,6 @@
 #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/ppc/int_helper.c b/target/ppc/int_helper.c
index 1607a7a42b8707152842747e737909de5c5a013f..03d37da79f7936882217bd1fc5279db646a52275 100644 (file)
--- a/target/ppc/int_helper.c
+++ b/target/ppc/int_helper.c
@@ -19,7 +19,6 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "internal.h"
-#include "exec/exec-all.h"
 #include "qemu/host-utils.h"
 #include "exec/helper-proto.h"
 #include "crypto/aes.h"

diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
index c2b775f4eb252b753f9399c1c1b673153af8bc76..c268065887d12bccbf6038ceef25e0060ab0c274 100644 (file)
--- a/target/s390x/cpu.c
+++ b/target/s390x/cpu.c
@@ -38,7 +38,6 @@
 #include "qapi/qapi-visit-misc.h"
 #include "qapi/qapi-visit-run-state.h"
 #include "sysemu/hw_accel.h"
-#include "exec/exec-all.h"
 #include "hw/qdev-properties.h"
 #ifndef CONFIG_USER_ONLY
 #include "hw/hw.h"

diff --git a/target/s390x/diag.c b/target/s390x/diag.c
index ac2c40f363a43d17b0c12e815287b779d2494e3c..0a1fabee51f2070ef32b7d4ebcd70bc407c3104e 100644 (file)
--- a/target/s390x/diag.c
+++ b/target/s390x/diag.c
@@ -16,7 +16,6 @@
 #include "cpu.h"
 #include "internal.h"
 #include "exec/address-spaces.h"
-#include "exec/exec-all.h"
 #include "hw/watchdog/wdt_diag288.h"
 #include "sysemu/cpus.h"
 #include "hw/s390x/ipl.h"

diff --git a/target/s390x/helper.c b/target/s390x/helper.c
index fd5791f1348a8b7e342cc00465af95ef96b2ed9f..254631693d3b4129e9c9f96c91f6ffb85f002e0e 100644 (file)
--- a/target/s390x/helper.c
+++ b/target/s390x/helper.c
@@ -23,7 +23,6 @@
 #include "internal.h"
 #include "exec/gdbstub.h"
 #include "qemu/timer.h"
-#include "exec/exec-all.h"
 #include "hw/s390x/ioinst.h"
 #include "sysemu/hw_accel.h"
 #ifndef CONFIG_USER_ONLY

diff --git a/target/tilegx/cpu.c b/target/tilegx/cpu.c
index b7451bdcf2f2ece065119d07c41de1346ddf9fa9..bfe9be59b573191a332c55c8bc59d3b08bc16b8b 100644 (file)
--- a/target/tilegx/cpu.c
+++ b/target/tilegx/cpu.c
@@ -24,7 +24,6 @@
 #include "qemu-common.h"
 #include "hw/qdev-properties.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/xtensa/core-dc232b.c b/target/xtensa/core-dc232b.c
index 70f33622ec8b7c287dc2203e6da285373085383d..71313378409eff33877b01bdc301b0199fa02719 100644 (file)
--- a/target/xtensa/core-dc232b.c
+++ b/target/xtensa/core-dc232b.c
@@ -27,7 +27,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/gdbstub.h"
 #include "qemu/host-utils.h"
 #include "qemu/timer.h"

diff --git a/target/xtensa/core-dc233c.c b/target/xtensa/core-dc233c.c
index 8296e6fa109aa2bf054b1544513c85404f4911f8..d701e3f5de071823a0200bbbf6fb8ff9d64af07a 100644 (file)
--- a/target/xtensa/core-dc233c.c
+++ b/target/xtensa/core-dc233c.c
@@ -27,7 +27,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/gdbstub.h"
 #include "qemu-common.h"
 #include "qemu/host-utils.h"

diff --git a/target/xtensa/core-de212.c b/target/xtensa/core-de212.c
index 53775a97fae0f1ebf19ca191733e83548f9c5f1f..7322179b56300db404e3c7f3d997261203a7e467 100644 (file)
--- a/target/xtensa/core-de212.c
+++ b/target/xtensa/core-de212.c
@@ -27,7 +27,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/gdbstub.h"
 #include "qemu-common.h"
 #include "qemu/host-utils.h"

diff --git a/target/xtensa/core-fsf.c b/target/xtensa/core-fsf.c
index 01932bdc8b1501030c56ff1772b72f819ff39e7a..e100e212b914ee4bcec3641d704bd6a1e38f08bf 100644 (file)
--- a/target/xtensa/core-fsf.c
+++ b/target/xtensa/core-fsf.c
@@ -27,7 +27,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/gdbstub.h"
 #include "qemu-common.h"
 #include "qemu/host-utils.h"

diff --git a/target/xtensa/core-sample_controller.c b/target/xtensa/core-sample_controller.c
index c622335ca5a26c8350be51c61d5451b2f85613a4..f433ea8d667011f35d36a40af0869971f4176b86 100644 (file)
--- a/target/xtensa/core-sample_controller.c
+++ b/target/xtensa/core-sample_controller.c
@@ -27,7 +27,6 @@
 
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/gdbstub.h"
 #include "qemu-common.h"
 #include "qemu/host-utils.h"

diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c
index 2b5b537222659b2ae7932b525402ba632d52e0eb..b50c840e09ec0411589d05c890a031620d8fb140 100644 (file)
--- a/target/xtensa/cpu.c
+++ b/target/xtensa/cpu.c
@@ -33,7 +33,6 @@
 #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/import_core.sh b/target/xtensa/import_core.sh
index af6c6104792d806c38ac7840257ab7b456829c4c..039406bf28fa0dd327136ae119257b830079f254 100755 (executable)
--- a/target/xtensa/import_core.sh
+++ b/target/xtensa/import_core.sh
@@ -39,7 +39,6 @@ tar -xf "$OVERLAY" -O binutils/xtensa-modules.c | \
 cat <<EOF > "${TARGET}.c"
 #include "qemu/osdep.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "exec/gdbstub.h"
 #include "qemu-common.h"
 #include "qemu/host-utils.h"

diff --git a/tcg/tcg-op-vec.c b/tcg/tcg-op-vec.c
index 2ca219734dc06067313ba181be6055ba5ed8da27..cefba3d185bbf24b8ece050f71774a1b1e0180f2 100644 (file)
--- a/tcg/tcg-op-vec.c
+++ b/tcg/tcg-op-vec.c
@@ -20,7 +20,6 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "cpu.h"
-#include "exec/exec-all.h"
 #include "tcg.h"
 #include "tcg-op.h"
 #include "tcg-mo.h"