| Message ID | 20250513173928.77376-20-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | target/arm: More header rework around arm_feature() & multiprocessing.h | expand |
On 5/13/25 10:39 AM, Philippe Mathieu-Daudé wrote: > Some files include "cpu.h", others "target/arm/cpu.h". > Unify by using the latter which is more explicit. > > Suggested-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > target/arm/cpregs.h | 2 +- > target/arm/cpu-features.h | 2 +- > target/arm/tcg/translate.h | 2 +- > target/arm/arch_dump.c | 2 +- > target/arm/arm-powerctl.c | 2 +- > target/arm/arm-qmp-cmds.c | 2 +- > target/arm/cortex-regs.c | 2 +- > target/arm/cpu.c | 2 +- > target/arm/cpu64.c | 2 +- > target/arm/debug_helper.c | 2 +- > target/arm/gdbstub.c | 2 +- > target/arm/gdbstub64.c | 2 +- > target/arm/helper.c | 2 +- > target/arm/hyp_gdbstub.c | 2 +- > target/arm/kvm-stub.c | 2 +- > target/arm/kvm.c | 2 +- > target/arm/machine.c | 2 +- > target/arm/ptw.c | 2 +- > target/arm/tcg-stubs.c | 2 +- > target/arm/tcg/cpu-v7m.c | 2 +- > target/arm/tcg/cpu32.c | 2 +- > target/arm/tcg/cpu64.c | 2 +- > target/arm/tcg/helper-a64.c | 2 +- > target/arm/tcg/hflags.c | 2 +- > target/arm/tcg/iwmmxt_helper.c | 2 +- > target/arm/tcg/m_helper.c | 2 +- > target/arm/tcg/mte_helper.c | 2 +- > target/arm/tcg/mve_helper.c | 2 +- > target/arm/tcg/neon_helper.c | 2 +- > target/arm/tcg/op_helper.c | 2 +- > target/arm/tcg/pauth_helper.c | 2 +- > target/arm/tcg/psci.c | 2 +- > target/arm/tcg/sme_helper.c | 2 +- > target/arm/tcg/sve_helper.c | 2 +- > target/arm/tcg/tlb-insns.c | 2 +- > target/arm/tcg/tlb_helper.c | 2 +- > target/arm/tcg/vec_helper.c | 2 +- > target/arm/tcg/vfp_helper.c | 2 +- > target/arm/vfp_fpscr.c | 2 +- > 39 files changed, 39 insertions(+), 39 deletions(-) Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
diff --git a/target/arm/cpregs.h b/target/arm/cpregs.h index c1a7ae37356..25a7c2928ba 100644 --- a/target/arm/cpregs.h +++ b/target/arm/cpregs.h @@ -23,7 +23,7 @@ #include "hw/registerfields.h" #include "target/arm/kvm-consts.h" -#include "cpu.h" +#include "target/arm/cpu.h" /* * ARMCPRegInfo type field bits: diff --git a/target/arm/cpu-features.h b/target/arm/cpu-features.h index 4452e7c21e3..90c5efd6eac 100644 --- a/target/arm/cpu-features.h +++ b/target/arm/cpu-features.h @@ -22,7 +22,7 @@ #include "hw/registerfields.h" #include "qemu/host-utils.h" -#include "cpu.h" +#include "target/arm/cpu.h" /* * Naming convention for isar_feature functions: diff --git a/target/arm/tcg/translate.h b/target/arm/tcg/translate.h index 1bfdb0fb9bb..f8eb0d4a5a8 100644 --- a/target/arm/tcg/translate.h +++ b/target/arm/tcg/translate.h @@ -1,7 +1,7 @@ #ifndef TARGET_ARM_TRANSLATE_H #define TARGET_ARM_TRANSLATE_H -#include "cpu.h" +#include "target/arm/cpu.h" #include "tcg/tcg-op.h" #include "tcg/tcg-op-gvec.h" #include "exec/translator.h" diff --git a/target/arm/arch_dump.c b/target/arm/arch_dump.c index 1dd79849c13..9c90430d1b6 100644 --- a/target/arm/arch_dump.c +++ b/target/arm/arch_dump.c @@ -19,7 +19,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "elf.h" #include "system/dump.h" #include "cpu-features.h" diff --git a/target/arm/arm-powerctl.c b/target/arm/arm-powerctl.c index 20c70c7d6bb..4cffe557e37 100644 --- a/target/arm/arm-powerctl.c +++ b/target/arm/arm-powerctl.c @@ -9,7 +9,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "cpu-qom.h" #include "internals.h" #include "arm-powerctl.h" diff --git a/target/arm/arm-qmp-cmds.c b/target/arm/arm-qmp-cmds.c index 930ec37413d..392887d3b48 100644 --- a/target/arm/arm-qmp-cmds.c +++ b/target/arm/arm-qmp-cmds.c @@ -30,7 +30,7 @@ #include "qapi/qapi-commands-misc-target.h" #include "qobject/qdict.h" #include "qom/qom-qobject.h" -#include "cpu.h" +#include "target/arm/cpu.h" static GICCapability *gic_cap_new(int version) { diff --git a/target/arm/cortex-regs.c b/target/arm/cortex-regs.c index ae817b08ddf..2caa8855f02 100644 --- a/target/arm/cortex-regs.c +++ b/target/arm/cortex-regs.c @@ -7,7 +7,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "cpregs.h" diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 759636a3b0e..00f06916e62 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -27,7 +27,7 @@ #include "target/arm/idau.h" #include "qemu/module.h" #include "qapi/error.h" -#include "cpu.h" +#include "target/arm/cpu.h" #ifdef CONFIG_TCG #include "exec/translation-block.h" #include "accel/tcg/cpu-ops.h" diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 00629a5d1d1..34f43094da9 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "cpregs.h" #include "qemu/module.h" #include "qemu/units.h" diff --git a/target/arm/debug_helper.c b/target/arm/debug_helper.c index 69fb1d0d9ff..a6199a73740 100644 --- a/target/arm/debug_helper.c +++ b/target/arm/debug_helper.c @@ -7,7 +7,7 @@ */ #include "qemu/osdep.h" #include "qemu/log.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "cpu-features.h" #include "cpregs.h" diff --git a/target/arm/gdbstub.c b/target/arm/gdbstub.c index ce4497ad7c3..d148d8434f1 100644 --- a/target/arm/gdbstub.c +++ b/target/arm/gdbstub.c @@ -18,7 +18,7 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "exec/gdbstub.h" #include "gdbstub/helpers.h" #include "gdbstub/commands.h" diff --git a/target/arm/gdbstub64.c b/target/arm/gdbstub64.c index 64ee9b3b567..b6033f431d8 100644 --- a/target/arm/gdbstub64.c +++ b/target/arm/gdbstub64.c @@ -18,7 +18,7 @@ */ #include "qemu/osdep.h" #include "qemu/log.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "gdbstub/helpers.h" #include "gdbstub/commands.h" diff --git a/target/arm/helper.c b/target/arm/helper.c index 7859729c39f..05a50c5c750 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -9,7 +9,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "trace.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "cpu-features.h" #include "exec/page-protection.h" diff --git a/target/arm/hyp_gdbstub.c b/target/arm/hyp_gdbstub.c index bb5969720ce..73c9a9a8333 100644 --- a/target/arm/hyp_gdbstub.c +++ b/target/arm/hyp_gdbstub.c @@ -10,7 +10,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "gdbstub/enums.h" diff --git a/target/arm/kvm-stub.c b/target/arm/kvm-stub.c index 34e57fab011..532018b745e 100644 --- a/target/arm/kvm-stub.c +++ b/target/arm/kvm-stub.c @@ -10,7 +10,7 @@ * */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "kvm_arm.h" bool write_kvmstate_to_list(ARMCPU *cpu) diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 5969249b579..d280d08a63e 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -25,7 +25,7 @@ #include "system/kvm.h" #include "system/kvm_int.h" #include "kvm_arm.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "trace.h" #include "internals.h" #include "hw/pci/pci.h" diff --git a/target/arm/machine.c b/target/arm/machine.c index e442d485241..f0524615fe1 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -1,5 +1,5 @@ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "qemu/error-report.h" #include "system/kvm.h" #include "system/tcg.h" diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 44170d831cc..03047d10d87 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -14,7 +14,7 @@ #include "exec/target_page.h" #include "exec/tlb-flags.h" #include "accel/tcg/probe.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "cpu-features.h" #include "idau.h" diff --git a/target/arm/tcg-stubs.c b/target/arm/tcg-stubs.c index 5e5166c0490..672b5b01db0 100644 --- a/target/arm/tcg-stubs.c +++ b/target/arm/tcg-stubs.c @@ -8,7 +8,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" void write_v7m_exception(CPUARMState *env, uint32_t new_exc) diff --git a/target/arm/tcg/cpu-v7m.c b/target/arm/tcg/cpu-v7m.c index 95b23d9b55d..9b7108d9678 100644 --- a/target/arm/tcg/cpu-v7m.c +++ b/target/arm/tcg/cpu-v7m.c @@ -9,7 +9,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "accel/tcg/cpu-ops.h" #include "internals.h" diff --git a/target/arm/tcg/cpu32.c b/target/arm/tcg/cpu32.c index 2c45b7eddda..5bf78d9240a 100644 --- a/target/arm/tcg/cpu32.c +++ b/target/arm/tcg/cpu32.c @@ -9,7 +9,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "accel/tcg/cpu-ops.h" #include "internals.h" #include "target/arm/idau.h" diff --git a/target/arm/tcg/cpu64.c b/target/arm/tcg/cpu64.c index 29ab0ac79da..c95036df2a5 100644 --- a/target/arm/tcg/cpu64.c +++ b/target/arm/tcg/cpu64.c @@ -20,7 +20,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "qemu/module.h" #include "qapi/visitor.h" #include "hw/qdev-properties.h" diff --git a/target/arm/tcg/helper-a64.c b/target/arm/tcg/helper-a64.c index 4f618ae390e..1713348a55d 100644 --- a/target/arm/tcg/helper-a64.c +++ b/target/arm/tcg/helper-a64.c @@ -19,7 +19,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "gdbstub/helpers.h" #include "exec/helper-proto.h" #include "qemu/host-utils.h" diff --git a/target/arm/tcg/hflags.c b/target/arm/tcg/hflags.c index 1ccec63bbd4..d77eacb7338 100644 --- a/target/arm/tcg/hflags.c +++ b/target/arm/tcg/hflags.c @@ -6,7 +6,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "cpu-features.h" #include "exec/translation-block.h" diff --git a/target/arm/tcg/iwmmxt_helper.c b/target/arm/tcg/iwmmxt_helper.c index ba054b6b4db..3489f6d01c3 100644 --- a/target/arm/tcg/iwmmxt_helper.c +++ b/target/arm/tcg/iwmmxt_helper.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #define HELPER_H "tcg/helper.h" #include "exec/helper-proto.h.inc" diff --git a/target/arm/tcg/m_helper.c b/target/arm/tcg/m_helper.c index 6614719832e..5d657f5c753 100644 --- a/target/arm/tcg/m_helper.c +++ b/target/arm/tcg/m_helper.c @@ -7,7 +7,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "cpu-features.h" #include "gdbstub/helpers.h" diff --git a/target/arm/tcg/mte_helper.c b/target/arm/tcg/mte_helper.c index 0efc18a181e..66e90b03520 100644 --- a/target/arm/tcg/mte_helper.c +++ b/target/arm/tcg/mte_helper.c @@ -19,7 +19,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "exec/page-protection.h" #ifdef CONFIG_USER_ONLY diff --git a/target/arm/tcg/mve_helper.c b/target/arm/tcg/mve_helper.c index 506d1c34757..105fc0a4b9d 100644 --- a/target/arm/tcg/mve_helper.c +++ b/target/arm/tcg/mve_helper.c @@ -18,7 +18,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "vec_internal.h" #include "exec/helper-proto.h" diff --git a/target/arm/tcg/neon_helper.c b/target/arm/tcg/neon_helper.c index 2cc8241f1e4..44f1aafd17d 100644 --- a/target/arm/tcg/neon_helper.c +++ b/target/arm/tcg/neon_helper.c @@ -8,7 +8,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "tcg/tcg-gvec-desc.h" #include "fpu/softfloat.h" #include "vec_internal.h" diff --git a/target/arm/tcg/op_helper.c b/target/arm/tcg/op_helper.c index e0f9c91450a..3a4a76e999e 100644 --- a/target/arm/tcg/op_helper.c +++ b/target/arm/tcg/op_helper.c @@ -18,7 +18,7 @@ */ #include "qemu/osdep.h" #include "qemu/main-loop.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "exec/helper-proto.h" #include "exec/target_page.h" #include "internals.h" diff --git a/target/arm/tcg/pauth_helper.c b/target/arm/tcg/pauth_helper.c index c591c3052c3..0ae329710ac 100644 --- a/target/arm/tcg/pauth_helper.c +++ b/target/arm/tcg/pauth_helper.c @@ -18,7 +18,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "cpu-features.h" #include "accel/tcg/cpu-ldst.h" diff --git a/target/arm/tcg/psci.c b/target/arm/tcg/psci.c index 0313cdd6ba2..05ecd647c9f 100644 --- a/target/arm/tcg/psci.c +++ b/target/arm/tcg/psci.c @@ -17,7 +17,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "exec/helper-proto.h" #include "kvm-consts.h" #include "qemu/main-loop.h" diff --git a/target/arm/tcg/sme_helper.c b/target/arm/tcg/sme_helper.c index de0c6e54d4b..a2104b4751d 100644 --- a/target/arm/tcg/sme_helper.c +++ b/target/arm/tcg/sme_helper.c @@ -18,7 +18,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "tcg/tcg-gvec-desc.h" #include "exec/helper-proto.h" diff --git a/target/arm/tcg/sve_helper.c b/target/arm/tcg/sve_helper.c index a2c363a4e17..afd110431cd 100644 --- a/target/arm/tcg/sve_helper.c +++ b/target/arm/tcg/sve_helper.c @@ -18,7 +18,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "exec/page-protection.h" #include "exec/helper-proto.h" diff --git a/target/arm/tcg/tlb-insns.c b/target/arm/tcg/tlb-insns.c index 95c26c6d463..bc8353cdbb5 100644 --- a/target/arm/tcg/tlb-insns.c +++ b/target/arm/tcg/tlb-insns.c @@ -9,7 +9,7 @@ #include "qemu/log.h" #include "exec/cputlb.h" #include "exec/target_page.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "cpu-features.h" #include "cpregs.h" diff --git a/target/arm/tcg/tlb_helper.c b/target/arm/tcg/tlb_helper.c index 23c72a99f5c..ea7d0c74c88 100644 --- a/target/arm/tcg/tlb_helper.c +++ b/target/arm/tcg/tlb_helper.c @@ -6,7 +6,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "cpu-features.h" diff --git a/target/arm/tcg/vec_helper.c b/target/arm/tcg/vec_helper.c index 986eaf8ffa4..9e2715e34de 100644 --- a/target/arm/tcg/vec_helper.c +++ b/target/arm/tcg/vec_helper.c @@ -18,7 +18,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "exec/helper-proto.h" #include "tcg/tcg-gvec-desc.h" #include "fpu/softfloat.h" diff --git a/target/arm/tcg/vfp_helper.c b/target/arm/tcg/vfp_helper.c index b1324c5c0a6..ac532ef8511 100644 --- a/target/arm/tcg/vfp_helper.c +++ b/target/arm/tcg/vfp_helper.c @@ -18,7 +18,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "cpu-features.h" #include "fpu/softfloat.h" diff --git a/target/arm/vfp_fpscr.c b/target/arm/vfp_fpscr.c index 92ea60ebbf2..a196bcfa803 100644 --- a/target/arm/vfp_fpscr.c +++ b/target/arm/vfp_fpscr.c @@ -18,7 +18,7 @@ */ #include "qemu/osdep.h" -#include "cpu.h" +#include "target/arm/cpu.h" #include "internals.h" #include "cpu-features.h"
Some files include "cpu.h", others "target/arm/cpu.h". Unify by using the latter which is more explicit. Suggested-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- target/arm/cpregs.h | 2 +- target/arm/cpu-features.h | 2 +- target/arm/tcg/translate.h | 2 +- target/arm/arch_dump.c | 2 +- target/arm/arm-powerctl.c | 2 +- target/arm/arm-qmp-cmds.c | 2 +- target/arm/cortex-regs.c | 2 +- target/arm/cpu.c | 2 +- target/arm/cpu64.c | 2 +- target/arm/debug_helper.c | 2 +- target/arm/gdbstub.c | 2 +- target/arm/gdbstub64.c | 2 +- target/arm/helper.c | 2 +- target/arm/hyp_gdbstub.c | 2 +- target/arm/kvm-stub.c | 2 +- target/arm/kvm.c | 2 +- target/arm/machine.c | 2 +- target/arm/ptw.c | 2 +- target/arm/tcg-stubs.c | 2 +- target/arm/tcg/cpu-v7m.c | 2 +- target/arm/tcg/cpu32.c | 2 +- target/arm/tcg/cpu64.c | 2 +- target/arm/tcg/helper-a64.c | 2 +- target/arm/tcg/hflags.c | 2 +- target/arm/tcg/iwmmxt_helper.c | 2 +- target/arm/tcg/m_helper.c | 2 +- target/arm/tcg/mte_helper.c | 2 +- target/arm/tcg/mve_helper.c | 2 +- target/arm/tcg/neon_helper.c | 2 +- target/arm/tcg/op_helper.c | 2 +- target/arm/tcg/pauth_helper.c | 2 +- target/arm/tcg/psci.c | 2 +- target/arm/tcg/sme_helper.c | 2 +- target/arm/tcg/sve_helper.c | 2 +- target/arm/tcg/tlb-insns.c | 2 +- target/arm/tcg/tlb_helper.c | 2 +- target/arm/tcg/vec_helper.c | 2 +- target/arm/tcg/vfp_helper.c | 2 +- target/arm/vfp_fpscr.c | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-)