Nothing in all our target "cpu.h" directly uses definitions from "exec/cpu-defs.h": no need to include it there. This remove a lot of target-specificities, simplifying inclusion of target "cpu.h" by common code.
Inspired-by: Pierrick Bouvier <[email protected]> Signed-off-by: Philippe Mathieu-Daudé <[email protected]> Reviewed-by: Pierrick Bouvier <[email protected]> Message-Id: <[email protected]> --- target/alpha/cpu.h | 1 - target/arm/cpu.h | 1 - target/avr/cpu.h | 1 - target/hexagon/cpu.h | 1 - target/hppa/cpu.h | 1 - target/i386/cpu.h | 1 - target/loongarch/cpu.h | 1 - target/m68k/cpu.h | 1 - target/microblaze/cpu.h | 1 - target/mips/cpu.h | 1 - target/or1k/cpu.h | 1 - target/ppc/cpu.h | 1 - target/riscv/cpu.h | 1 - target/rx/cpu.h | 1 - target/s390x/cpu.h | 1 - target/sh4/cpu.h | 1 - target/sparc/cpu.h | 1 - target/tricore/cpu.h | 1 - 18 files changed, 18 deletions(-) diff --git a/target/alpha/cpu.h b/target/alpha/cpu.h index b530cd0088b..2f611397782 100644 --- a/target/alpha/cpu.h +++ b/target/alpha/cpu.h @@ -22,7 +22,6 @@ #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 5e4f12f1e77..0b9755533b0 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -25,7 +25,6 @@ #include "hw/core/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" #include "exec/page-protection.h" diff --git a/target/avr/cpu.h b/target/avr/cpu.h index 518e243d812..3da885c7ccb 100644 --- a/target/avr/cpu.h +++ b/target/avr/cpu.h @@ -23,7 +23,6 @@ #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 faa07a6e05b..7c09c97db85 100644 --- a/target/hexagon/cpu.h +++ b/target/hexagon/cpu.h @@ -22,7 +22,6 @@ #include "cpu-qom.h" #include "exec/cpu-common.h" -#include "exec/cpu-defs.h" #include "exec/target_long.h" #include "hex_regs.h" #include "mmvec/mmvec.h" diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 6ea4c9b6826..85f39401423 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -22,7 +22,6 @@ #include "cpu-qom.h" #include "exec/cpu-common.h" -#include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "exec/target_long.h" #include "system/memory.h" diff --git a/target/i386/cpu.h b/target/i386/cpu.h index fd8d98a4bdd..f57c99e8b4e 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -24,7 +24,6 @@ #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/target_long.h" #include "exec/memop.h" diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h index 4d333806ed8..096d7789285 100644 --- a/target/loongarch/cpu.h +++ b/target/loongarch/cpu.h @@ -10,7 +10,6 @@ #include "qemu/int128.h" #include "exec/cpu-common.h" -#include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "fpu/softfloat-types.h" #include "hw/core/registerfields.h" diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index 7911ab9de30..d7f508a9e80 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -22,7 +22,6 @@ #define M68K_CPU_H #include "exec/cpu-common.h" -#include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "qemu/cpu-float.h" #include "cpu-qom.h" diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h index 5a856edaaa9..5765786e6dc 100644 --- a/target/microblaze/cpu.h +++ b/target/microblaze/cpu.h @@ -22,7 +22,6 @@ #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 3517d2d42cf..17e9f6039ec 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -3,7 +3,6 @@ #include "cpu-qom.h" #include "exec/cpu-common.h" -#include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "exec/target_long.h" #ifndef CONFIG_USER_ONLY diff --git a/target/or1k/cpu.h b/target/or1k/cpu.h index c8e2827930b..5bb39b67519 100644 --- a/target/or1k/cpu.h +++ b/target/or1k/cpu.h @@ -22,7 +22,6 @@ #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 a0df7a467ed..aba8109bbba 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -23,7 +23,6 @@ #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 "exec/target_long.h" #include "cpu-qom.h" diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index df55a77c403..e42f3694089 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -24,7 +24,6 @@ #include "hw/core/registerfields.h" #include "hw/core/qdev-properties.h" #include "exec/cpu-common.h" -#include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "exec/gdbstub.h" #include "exec/target_long.h" diff --git a/target/rx/cpu.h b/target/rx/cpu.h index b3b1ecff5af..b500b7a2474 100644 --- a/target/rx/cpu.h +++ b/target/rx/cpu.h @@ -24,7 +24,6 @@ #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 40bc1f0741d..3acbe83f0fc 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -28,7 +28,6 @@ #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" #include "qapi/qapi-types-machine-common.h" diff --git a/target/sh4/cpu.h b/target/sh4/cpu.h index b0759010c47..e36268b4256 100644 --- a/target/sh4/cpu.h +++ b/target/sh4/cpu.h @@ -22,7 +22,6 @@ #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 155aa8ec637..ac0eb9f0faa 100644 --- a/target/sparc/cpu.h +++ b/target/sparc/cpu.h @@ -3,7 +3,6 @@ #include "qemu/bswap.h" #include "cpu-qom.h" -#include "exec/cpu-defs.h" #include "exec/cpu-interrupt.h" #include "exec/target_long.h" #include "qemu/cpu-float.h" diff --git a/target/tricore/cpu.h b/target/tricore/cpu.h index ab46192e261..604fb7792c6 100644 --- a/target/tricore/cpu.h +++ b/target/tricore/cpu.h @@ -23,7 +23,6 @@ #include "cpu-qom.h" #include "hw/core/registerfields.h" #include "exec/cpu-common.h" -#include "exec/cpu-defs.h" #include "qemu/cpu-float.h" #include "tricore-defs.h" -- 2.53.0
