[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC v14 76/80] target/arm: cpu64: rename arm_cpu_finalize_features
From: |
Claudio Fontana |
Subject: |
[RFC v14 76/80] target/arm: cpu64: rename arm_cpu_finalize_features |
Date: |
Fri, 16 Apr 2021 18:28:20 +0200 |
also remove the now useless ifdef TARGET_AARCH64 from the function
Signed-off-by: Claudio Fontana <cfontana@suse.de>
---
target/arm/cpu-sve.h | 2 +-
target/arm/cpu.h | 2 +-
target/arm/tcg/cpu-pauth.h | 2 +-
target/arm/cpu.c | 2 +-
target/arm/cpu64.c | 4 +---
target/arm/monitor.c | 4 ++--
6 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/target/arm/cpu-sve.h b/target/arm/cpu-sve.h
index c83508ea0a..85078550bb 100644
--- a/target/arm/cpu-sve.h
+++ b/target/arm/cpu-sve.h
@@ -25,7 +25,7 @@
#include "cpu.h"
-/* called by arm_cpu_finalize_features in realizefn */
+/* called by aarch64_cpu_finalize_features in realizefn */
bool cpu_sve_finalize_features(ARMCPU *cpu, Error **errp);
/* add the CPU SVE properties */
diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index 236717ec71..dbbad48fda 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -2110,7 +2110,7 @@ static inline int arm_feature(CPUARMState *env, int
feature)
return (env->features & (1ULL << feature)) != 0;
}
-void arm_cpu_finalize_features(ARMCPU *cpu, Error **errp);
+void aarch64_cpu_finalize_features(ARMCPU *cpu, Error **errp);
#if !defined(CONFIG_USER_ONLY)
/* Return true if exception levels below EL3 are in secure state,
diff --git a/target/arm/tcg/cpu-pauth.h b/target/arm/tcg/cpu-pauth.h
index a0ef74dc77..b106b9cefc 100644
--- a/target/arm/tcg/cpu-pauth.h
+++ b/target/arm/tcg/cpu-pauth.h
@@ -25,7 +25,7 @@
#include "cpu.h"
-/* called by arm_cpu_finalize_features in realizefn */
+/* called by aarch64_cpu_finalize_features in realizefn */
bool cpu_pauth_finalize(ARMCPU *cpu, Error **errp);
/* add the CPU Pointer Authentication properties */
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index 4d0724b537..fac297df4e 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -843,7 +843,7 @@ static void arm_cpu_realizefn(DeviceState *dev, Error
**errp)
}
#ifdef TARGET_AARCH64
- arm_cpu_finalize_features(cpu, &local_err);
+ aarch64_cpu_finalize_features(cpu, &local_err);
if (local_err != NULL) {
error_propagate(errp, local_err);
return;
diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
index bcbfc5d53a..5b8dc8ff14 100644
--- a/target/arm/cpu64.c
+++ b/target/arm/cpu64.c
@@ -455,11 +455,10 @@ static gchar *aarch64_gdb_arch_name(CPUState *cs)
return g_strdup("aarch64");
}
-void arm_cpu_finalize_features(ARMCPU *cpu, Error **errp)
+void aarch64_cpu_finalize_features(ARMCPU *cpu, Error **errp)
{
Error *local_err = NULL;
-#ifdef TARGET_AARCH64
if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) {
if (!cpu_sve_finalize_features(cpu, &local_err)) {
error_propagate(errp, local_err);
@@ -478,7 +477,6 @@ void arm_cpu_finalize_features(ARMCPU *cpu, Error **errp)
}
}
}
-#endif /* TARGET_AARCH64 */
if (kvm_enabled()) {
kvm_arm_steal_time_finalize(cpu, &local_err);
diff --git a/target/arm/monitor.c b/target/arm/monitor.c
index 95c1e72cd1..8a31c4dd04 100644
--- a/target/arm/monitor.c
+++ b/target/arm/monitor.c
@@ -186,7 +186,7 @@ CpuModelExpansionInfo
*qmp_query_cpu_model_expansion(CpuModelExpansionType type,
}
#ifdef TARGET_AARCH64
if (!err) {
- arm_cpu_finalize_features(ARM_CPU(obj), &err);
+ aarch64_cpu_finalize_features(ARM_CPU(obj), &err);
}
#endif /* TARGET_AARCH64 */
visit_end_struct(visitor, NULL);
@@ -198,7 +198,7 @@ CpuModelExpansionInfo
*qmp_query_cpu_model_expansion(CpuModelExpansionType type,
}
} else {
#ifdef TARGET_AARCH64
- arm_cpu_finalize_features(ARM_CPU(obj), &error_abort);
+ aarch64_cpu_finalize_features(ARM_CPU(obj), &error_abort);
#endif /* TARGET_AARCH64 */
}
--
2.26.2
- [RFC v14 65/80] target/arm: arch_dump: restrict ELFCLASS64 to AArch64, (continued)
- [RFC v14 65/80] target/arm: arch_dump: restrict ELFCLASS64 to AArch64, Claudio Fontana, 2021/04/16
- [RFC v14 67/80] target/arm: tcg: restrict ZCR cpregs to TARGET_AARCH64, Claudio Fontana, 2021/04/16
- [RFC v14 71/80] cpu-sve: rename sve_zcr_len_for_el to cpu_sve_get_zcr_len_for_el, Claudio Fontana, 2021/04/16
- [RFC v14 66/80] target/arm: cpu-exceptions, cpu-exceptions-aa64: new modules, Claudio Fontana, 2021/04/16
- [RFC v14 72/80] target/arm: cpu-common: wrap a64-only check with is_a64, Claudio Fontana, 2021/04/16
- [RFC v14 70/80] target/arm: move sve_zcr_len_for_el to TARGET_AARCH64-only cpu-sve, Claudio Fontana, 2021/04/16
- [RFC v14 74/80] target/arm: cpu-pauth: change arm_cpu_pauth_finalize name and sig, Claudio Fontana, 2021/04/16
- [RFC v14 73/80] target/arm: cpu-pauth: new module for ARMv8.3 Pointer Authentication, Claudio Fontana, 2021/04/16
- [RFC v14 68/80] target/arm: tcg-sve: import narrow_vq and change_el functions, Claudio Fontana, 2021/04/16
- [RFC v14 69/80] target/arm: tcg-sve: rename the narrow_vq and change_el functions, Claudio Fontana, 2021/04/16
- [RFC v14 76/80] target/arm: cpu64: rename arm_cpu_finalize_features,
Claudio Fontana <=
- [RFC v14 77/80] target/arm: cpu64: some final cleanup on aarch64_cpu_finalize_features, Claudio Fontana, 2021/04/16
- [RFC v14 80/80] target/arm: remove v7m stub function for !CONFIG_TCG, Claudio Fontana, 2021/04/16
- [RFC v14 79/80] target/arm: tcg: remove superfluous CONFIG_TCG check, Claudio Fontana, 2021/04/16
- [RFC v14 78/80] XXX target/arm: experiment refactoring cpu "max", Claudio Fontana, 2021/04/16
- [RFC v14 75/80] target/arm: move arm_cpu_finalize_features into cpu64, Claudio Fontana, 2021/04/16