[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 20/36] target/arm: Declare ARM_CPU_TYPE_NAME/SUFFIX in 'cpu-qom.h'
From: |
Peter Maydell |
Subject: |
[PULL 20/36] target/arm: Declare ARM_CPU_TYPE_NAME/SUFFIX in 'cpu-qom.h' |
Date: |
Fri, 26 Jan 2024 14:33:25 +0000 |
From: Philippe Mathieu-Daudé <philmd@linaro.org>
Missed in commit 2d56be5a29 ("target: Declare
FOO_CPU_TYPE_NAME/SUFFIX in 'cpu-qom.h'"). See
it for more details.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20240118200643.29037-12-philmd@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
target/arm/cpu-qom.h | 3 +++
target/arm/cpu.h | 2 --
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/target/arm/cpu-qom.h b/target/arm/cpu-qom.h
index 02b914c8767..f795994135f 100644
--- a/target/arm/cpu-qom.h
+++ b/target/arm/cpu-qom.h
@@ -33,4 +33,7 @@ typedef struct AArch64CPUClass AArch64CPUClass;
DECLARE_CLASS_CHECKERS(AArch64CPUClass, AARCH64_CPU,
TYPE_AARCH64_CPU)
+#define ARM_CPU_TYPE_SUFFIX "-" TYPE_ARM_CPU
+#define ARM_CPU_TYPE_NAME(name) (name ARM_CPU_TYPE_SUFFIX)
+
#endif
diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index cecac4c0a12..41659d0ef15 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -2837,8 +2837,6 @@ bool write_cpustate_to_list(ARMCPU *cpu, bool kvm_sync);
#define ARM_CPUID_TI915T 0x54029152
#define ARM_CPUID_TI925T 0x54029252
-#define ARM_CPU_TYPE_SUFFIX "-" TYPE_ARM_CPU
-#define ARM_CPU_TYPE_NAME(name) (name ARM_CPU_TYPE_SUFFIX)
#define CPU_RESOLVING_TYPE TYPE_ARM_CPU
#define TYPE_ARM_HOST_CPU "host-" TYPE_ARM_CPU
--
2.34.1
- [PULL 02/36] target/arm: Fix VNCR fault detection logic, (continued)
- [PULL 02/36] target/arm: Fix VNCR fault detection logic, Peter Maydell, 2024/01/26
- [PULL 03/36] hw/arm/virt.c: Remove newline from error_report() string, Peter Maydell, 2024/01/26
- [PULL 06/36] hw/arm/nseries: Unconditionally map the TUSB6010 USB Host controller, Peter Maydell, 2024/01/26
- [PULL 10/36] hw/arm/exynos4210: Include missing 'exec/tswap.h' header, Peter Maydell, 2024/01/26
- [PULL 11/36] hw/arm/xilinx_zynq: Include missing 'exec/tswap.h' header, Peter Maydell, 2024/01/26
- [PULL 13/36] hw/arm/xlnx-versal: Include missing 'cpu.h' header, Peter Maydell, 2024/01/26
- [PULL 15/36] target/arm/cpregs: Include missing 'hw/registerfields.h' header, Peter Maydell, 2024/01/26
- [PULL 04/36] hw/arm/musicpal: Convert to qemu_add_kbd_event_handler(), Peter Maydell, 2024/01/26
- [PULL 12/36] hw/arm/smmuv3: Include missing 'hw/registerfields.h' header, Peter Maydell, 2024/01/26
- [PULL 08/36] hw/arm: Add AHCI/SATA controller to Allwinner R40 and Bananapi board, Peter Maydell, 2024/01/26
- [PULL 20/36] target/arm: Declare ARM_CPU_TYPE_NAME/SUFFIX in 'cpu-qom.h',
Peter Maydell <=
- [PULL 14/36] target/arm/cpu-features: Include missing 'hw/registerfields.h' header, Peter Maydell, 2024/01/26
- [PULL 16/36] target/arm/cpregs: Include missing 'kvm-consts.h' header, Peter Maydell, 2024/01/26
- [PULL 17/36] target/arm: Rename arm_cpu_mp_affinity, Peter Maydell, 2024/01/26
- [PULL 18/36] target/arm: Create arm_cpu_mp_affinity, Peter Maydell, 2024/01/26
- [PULL 19/36] target/arm: Expose arm_cpu_mp_affinity() in 'multiprocessing.h' header, Peter Maydell, 2024/01/26
- [PULL 21/36] hw/cpu/a9mpcore: Build it only once, Peter Maydell, 2024/01/26
- [PULL 23/36] hw/misc/xlnx-versal-crl: Build it only once, Peter Maydell, 2024/01/26
- [PULL 22/36] hw/misc/xlnx-versal-crl: Include generic 'cpu-qom.h' instead of 'cpu.h', Peter Maydell, 2024/01/26
- [PULL 25/36] hw/arm/armv7m: Make 'hw/intc/armv7m_nvic.h' a target agnostic header, Peter Maydell, 2024/01/26
- [PULL 30/36] fsl-imx6ul: Add various missing unimplemented devices, Peter Maydell, 2024/01/26