exec/cpu-all: transfer exec/cpu-common include to cpu.h headers

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-ID: <20250325045915.994760-15-pierrick.bouvier@linaro.org>

diff --git a/cpu-target.c b/cpu-target.c
index 7f3b244ed11e9b46a3e8478ae1d14deee1ea8946..14cd623bffe0b1da45a1b646f584c13ca57fc179 100644 (file)
--- a/cpu-target.c
+++ b/cpu-target.c
@@ -24,6 +24,7 @@
 #include "qemu/qemu-print.h"
 #include "system/accel-ops.h"
 #include "system/cpus.h"
+#include "exec/cpu-common.h"
 #include "exec/tswap.h"
 #include "exec/replay-core.h"
 #include "exec/log.h"

diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index e7c8b8672fa867c499cbc08b9f6f24da5b160a9a..5122fdbee39b35ae8b73d4b4119d74877a1d2e6f 100644 (file)
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -19,7 +19,6 @@
 #ifndef CPU_ALL_H
 #define CPU_ALL_H
 
-#include "exec/cpu-common.h"
 #include "hw/core/cpu.h"
 #include "exec/cpu-defs.h"
 

diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
index 77dc5ac61cc7b00f49d67386c0d9829068ae5af3..63847f6e618aad57560983a65567f4edbba592b8 100644 (file)
--- a/include/exec/cpu_ldst.h
+++ b/include/exec/cpu_ldst.h
@@ -66,6 +66,7 @@
 #error Can only include this header with TCG
 #endif
 
+#include "exec/cpu-common.h"
 #include "exec/cpu-ldst-common.h"
 #include "accel/tcg/cpu-mmu-index.h"
 #include "exec/abi_ptr.h"

diff --git a/target/alpha/cpu.h b/target/alpha/cpu.h
index 42788a6a0bc8a8aaf493b27bb2fd14598a84a3fc..fb1d63527ef831878a00b9bcb7e7550902230504 100644 (file)
--- a/target/alpha/cpu.h
+++ b/target/alpha/cpu.h
@@ -21,6 +21,7 @@
 #define ALPHA_CPU_H
 
 #include "cpu-qom.h"
+#include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "qemu/cpu-float.h"

diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index 958a921490eb09ee5107baba8e0a6f1e730b7f44..ee92476814ccca42c3f153ee05fbd2a14e85e609 100644 (file)
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -24,6 +24,7 @@
 #include "qemu/cpu-float.h"
 #include "hw/registerfields.h"
 #include "cpu-qom.h"
+#include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "exec/gdbstub.h"

diff --git a/target/avr/cpu.h b/target/avr/cpu.h
index c2cc2daa66654dbf7f8815ee996e1e4506141da0..a0fb40141a45f9909e29ff3eb9889d5565b6ad74 100644 (file)
--- a/target/avr/cpu.h
+++ b/target/avr/cpu.h
@@ -22,6 +22,7 @@
 #define QEMU_AVR_CPU_H
 
 #include "cpu-qom.h"
+#include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "system/memory.h"

diff --git a/target/hexagon/cpu.h b/target/hexagon/cpu.h
index f78c8f9c2a006238c86457a3f9b1a2da6ffc198d..e4fc35b112d1f8d29e33aee4673deb62ce0e0cdf 100644 (file)
--- a/target/hexagon/cpu.h
+++ b/target/hexagon/cpu.h
@@ -21,6 +21,7 @@
 #include "fpu/softfloat-types.h"
 
 #include "cpu-qom.h"
+#include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"
 #include "hex_regs.h"
 #include "mmvec/mmvec.h"

diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h
index dab58c227f46f7738173b3733f0f06a06fd7b862..4e72ab025b1101d6d3f8b1c67a7758a74fd7f6fa 100644 (file)
--- a/target/hppa/cpu.h
+++ b/target/hppa/cpu.h
@@ -21,6 +21,7 @@
 #define HPPA_CPU_H
 
 #include "cpu-qom.h"
+#include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "system/memory.h"

diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index 778dfd963729fc13d68a8b3a7e568e097f2ccb53..02ea87347a5b7ba9138ad7fd532d294de532d5ca 100644 (file)
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -23,6 +23,7 @@
 #include "system/tcg.h"
 #include "cpu-qom.h"
 #include "kvm/hyperv-proto.h"
+#include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "exec/memop.h"

diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
index a924aa01d7c3f928fc2aae284b72112b419804d0..69117c602afd790e96141a9273cafb9be0f85a3f 100644 (file)
--- a/target/loongarch/cpu.h
+++ b/target/loongarch/cpu.h
@@ -9,6 +9,7 @@
 #define LOONGARCH_CPU_H
 
 #include "qemu/int128.h"
+#include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "fpu/softfloat-types.h"

diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h
index 451644a05a3c24de6daf68b248d731c399a89b17..5347fbe3975fc21002a0f3cc08e4c0ac2239a9bb 100644 (file)
--- a/target/m68k/cpu.h
+++ b/target/m68k/cpu.h
@@ -21,6 +21,7 @@
 #ifndef M68K_CPU_H
 #define M68K_CPU_H
 
+#include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "qemu/cpu-float.h"

diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h
index d29681abed4b48f54891fd2854dc53d53938e1b0..90d820b90c736021c6496b651cb7452e1d29c59c 100644 (file)
--- a/target/microblaze/cpu.h
+++ b/target/microblaze/cpu.h
@@ -21,6 +21,7 @@
 #define MICROBLAZE_CPU_H
 
 #include "cpu-qom.h"
+#include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"
 #include "qemu/cpu-float.h"
 #include "exec/cpu-interrupt.h"

diff --git a/target/mips/cpu.h b/target/mips/cpu.h
index 29362498ec4c3b0d65fd3f1fe91685a86374520a..79f8041ced4987654ce4274fa86e4105d91e5fb3 100644 (file)
--- a/target/mips/cpu.h
+++ b/target/mips/cpu.h
@@ -2,6 +2,7 @@
 #define MIPS_CPU_H
 
 #include "cpu-qom.h"
+#include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #ifndef CONFIG_USER_ONLY

diff --git a/target/openrisc/cpu.h b/target/openrisc/cpu.h
index c153823b629f2d97d66f02b8a43fa846fcdc127f..f16a070ef6c3145e84deb82d3cec5254eb23a237 100644 (file)
--- a/target/openrisc/cpu.h
+++ b/target/openrisc/cpu.h
@@ -21,6 +21,7 @@
 #define OPENRISC_CPU_H
 
 #include "cpu-qom.h"
+#include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "fpu/softfloat-types.h"

diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index 7489ba95648e80c4e4cf7d63f50182a67dff18e9..aa5df47bdafef3bb76270fcab87224b5b8597dea 100644 (file)
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -22,6 +22,7 @@
 
 #include "qemu/int128.h"
 #include "qemu/cpu-float.h"
+#include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "cpu-qom.h"

diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h
index 556eda57e943e37dc490c2482c4659a0a0794601..14a6779b4c17640af8aa5185903813ddddb05e53 100644 (file)
--- a/target/riscv/cpu.h
+++ b/target/riscv/cpu.h
@@ -23,6 +23,7 @@
 #include "hw/core/cpu.h"
 #include "hw/registerfields.h"
 #include "hw/qdev-properties.h"
+#include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "exec/gdbstub.h"

diff --git a/target/rx/cpu.h b/target/rx/cpu.h
index 5f2fcb6656311dc9cb9ce820cd8581d2a625aedb..e2ec78835e4cb19cb41c3a57f4b77d1b265d041f 100644 (file)
--- a/target/rx/cpu.h
+++ b/target/rx/cpu.h
@@ -23,6 +23,7 @@
 #include "hw/registerfields.h"
 #include "cpu-qom.h"
 
+#include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "qemu/cpu-float.h"

diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
index 0a32ad4c613250cc6fc7231bf18a773c990765a8..83d01d5c4e1bb3f520a2a0ce8c27c33bc01b4f1f 100644 (file)
--- a/target/s390x/cpu.h
+++ b/target/s390x/cpu.h
@@ -27,6 +27,7 @@
 
 #include "cpu-qom.h"
 #include "cpu_models.h"
+#include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "qemu/cpu-float.h"

diff --git a/target/sh4/cpu.h b/target/sh4/cpu.h
index 18557d8c386106627278612069694df1c4535501..7581f5eecb7edf614619548841b8f4fa47dcbbff 100644 (file)
--- a/target/sh4/cpu.h
+++ b/target/sh4/cpu.h
@@ -21,6 +21,7 @@
 #define SH4_CPU_H
 
 #include "cpu-qom.h"
+#include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "qemu/cpu-float.h"

diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h
index c0aab69b6155d26eec7fe4ad3b48a543aa45f3a9..b87351a6660170d5068575c27a3699ce15d81675 100644 (file)
--- a/target/sparc/cpu.h
+++ b/target/sparc/cpu.h
@@ -3,6 +3,7 @@
 
 #include "qemu/bswap.h"
 #include "cpu-qom.h"
+#include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "qemu/cpu-float.h"

diff --git a/target/tricore/cpu.h b/target/tricore/cpu.h
index cf9dbc6df8ee6af623baf11e036e969c694b5743..abb9cba136dff2224ed4a49aa1fceb9b0c02ab45 100644 (file)
--- a/target/tricore/cpu.h
+++ b/target/tricore/cpu.h
@@ -22,6 +22,7 @@
 
 #include "cpu-qom.h"
 #include "hw/registerfields.h"
+#include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"
 #include "qemu/cpu-float.h"
 #include "tricore-defs.h"

diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h
index 6684631478658aa350f21fff365b7c3ebb5267bb..c5d2042de14523e8acef5290290c0f24c935619c 100644 (file)
--- a/target/xtensa/cpu.h
+++ b/target/xtensa/cpu.h
@@ -30,6 +30,7 @@
 
 #include "cpu-qom.h"
 #include "qemu/cpu-float.h"
+#include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "hw/clock.h"