[RFC v10 48/49] target/arm: refactor arm_cpu_finalize_features into cpu64

[Claudio Fontana]

all the features in arm_cpu_finalize_features are actually
TARGET_AARCH64-only, since KVM is now only supported on 64bit.

Therefore move the function to cpu64, and rename it to
aarch64_cpu_finalize_features.

Signed-off-by: Claudio Fontana <cfontana@suse.de>
---
 target/arm/cpu.h         |  3 +-
 target/arm/kvm/kvm_arm.h |  5 ++--
 target/arm/cpu.c         | 65 ++++++++++------------------------------
 target/arm/cpu64.c       | 25 ++++++++++++++++
 target/arm/kvm/kvm64.c   |  7 +++--
 target/arm/monitor.c     |  8 +++--
 6 files changed, 54 insertions(+), 59 deletions(-)

diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index e9cfb99ad9..99c03fd6b4 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -1036,6 +1036,7 @@ int arm_cpu_write_elf32_note(WriteCoreDumpFunction f, 
CPUState *cs,
 #ifdef TARGET_AARCH64
 int aarch64_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg);
 int aarch64_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
+bool aarch64_cpu_finalize_features(ARMCPU *cpu, Error **errp);
 
 static inline bool is_a64(CPUARMState *env)
 {
@@ -2096,8 +2097,6 @@ static inline int arm_feature(CPUARMState *env, int 
feature)
     return (env->features & (1ULL << feature)) != 0;
 }
 
-void arm_cpu_finalize_features(ARMCPU *cpu, Error **errp);
-
 #if !defined(CONFIG_USER_ONLY)
 /* Return true if exception levels below EL3 are in secure state,
  * or would be following an exception return to that level.
diff --git a/target/arm/kvm/kvm_arm.h b/target/arm/kvm/kvm_arm.h
index 34f8daa377..5c0d58f527 100644
--- a/target/arm/kvm/kvm_arm.h
+++ b/target/arm/kvm/kvm_arm.h
@@ -275,7 +275,7 @@ void kvm_arm_add_vcpu_properties(Object *obj);
  * Validate the kvm-steal-time property selection and set its default
  * based on KVM support and guest configuration.
  */
-void kvm_arm_steal_time_finalize(ARMCPU *cpu, Error **errp);
+bool kvm_arm_steal_time_finalize(ARMCPU *cpu, Error **errp);
 
 /**
  * kvm_arm_steal_time_supported:
@@ -436,9 +436,10 @@ static inline void kvm_arm_pvtime_init(CPUState *cs, 
uint64_t ipa)
     g_assert_not_reached();
 }
 
-static inline void kvm_arm_steal_time_finalize(ARMCPU *cpu, Error **errp)
+static inline bool kvm_arm_steal_time_finalize(ARMCPU *cpu, Error **errp)
 {
     g_assert_not_reached();
+    return false;
 }
 
 static inline void kvm_arm_sve_get_vls(CPUState *cs, unsigned long *map)
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index 82c55b4820..46afe3f134 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -23,7 +23,6 @@
 #include "target/arm/idau.h"
 #include "qapi/error.h"
 #include "cpu.h"
-#include "cpu-sve.h"
 #include "cpregs.h"
 
 #ifdef CONFIG_TCG
@@ -815,40 +814,6 @@ static void arm_cpu_finalizefn(Object *obj)
 #endif
 }
 
-void arm_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);
-            return;
-        }
-
-        /*
-         * KVM does not support modifications to this feature.
-         * We have not registered the cpu properties when KVM
-         * is in use, so the user will not be able to set them.
-         */
-        if (tcg_enabled()) {
-            if (!cpu_pauth_finalize(cpu, &local_err)) {
-                error_propagate(errp, local_err);
-                return;
-            }
-        }
-    }
-#endif /* TARGET_AARCH64 */
-
-    if (kvm_enabled()) {
-        kvm_arm_steal_time_finalize(cpu, &local_err);
-        if (local_err != NULL) {
-            error_propagate(errp, local_err);
-            return;
-        }
-    }
-}
-
 static void arm_cpu_realizefn(DeviceState *dev, Error **errp)
 {
     CPUState *cs = CPU(dev);
@@ -871,22 +836,22 @@ static void arm_cpu_realizefn(DeviceState *dev, Error 
**errp)
         return;
     }
 
-    arm_cpu_finalize_features(cpu, &local_err);
-    if (local_err != NULL) {
-        error_propagate(errp, local_err);
-        return;
-    }
-
-    if (arm_feature(env, ARM_FEATURE_AARCH64) &&
-        cpu->has_vfp != cpu->has_neon) {
-        /*
-         * This is an architectural requirement for AArch64; AArch32 is
-         * more flexible and permits VFP-no-Neon and Neon-no-VFP.
-         */
-        error_setg(errp,
-                   "AArch64 CPUs must have both VFP and Neon or neither");
-        return;
+#ifdef TARGET_AARCH64
+    if (arm_feature(env, ARM_FEATURE_AARCH64)) {
+        if (!aarch64_cpu_finalize_features(cpu, errp)) {
+            return;
+        }
+        if (cpu->has_vfp != cpu->has_neon) {
+            /*
+             * This is an architectural requirement for AArch64; AArch32 is
+             * more flexible and permits VFP-no-Neon and Neon-no-VFP.
+             */
+            error_setg(errp,
+                       "AArch64 CPUs must have both VFP and Neon or neither");
+            return;
+        }
     }
+#endif /* TARGET_AARCH64 */
 
     if (!cpu->has_vfp) {
         uint64_t t;
diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
index 9bc5ddfc09..d67c0b1be4 100644
--- a/target/arm/cpu64.c
+++ b/target/arm/cpu64.c
@@ -22,6 +22,8 @@
 #include "qapi/error.h"
 #include "qemu/qemu-print.h"
 #include "cpu.h"
+#include "cpu-sve.h"
+#include "tcg/cpu-pauth.h"
 #include "cpu-exceptions-aa64.h"
 #include "qemu/module.h"
 #include "sysemu/tcg.h"
@@ -454,6 +456,29 @@ static gchar *aarch64_gdb_arch_name(CPUState *cs)
     return g_strdup("aarch64");
 }
 
+bool aarch64_cpu_finalize_features(ARMCPU *cpu, Error **errp)
+{
+    if (!cpu_sve_finalize_features(cpu, errp)) {
+        return false;
+    }
+    if (tcg_enabled()) {
+        /*
+         * KVM does not support modifications to this feature.
+         * We have not registered the cpu properties when KVM
+         * is in use, so the user will not be able to set them.
+         */
+        if (!cpu_pauth_finalize(cpu, errp)) {
+            return false;
+        }
+    }
+    if (kvm_enabled()) {
+        if (!kvm_arm_steal_time_finalize(cpu, errp)) {
+            return false;
+        }
+    }
+    return true;
+}
+
 static void aarch64_cpu_dump_state(CPUState *cs, FILE *f, int flags)
 {
     ARMCPU *cpu = ARM_CPU(cs);
diff --git a/target/arm/kvm/kvm64.c b/target/arm/kvm/kvm64.c
index b34642e74c..372957331b 100644
--- a/target/arm/kvm/kvm64.c
+++ b/target/arm/kvm/kvm64.c
@@ -677,7 +677,7 @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)
     return true;
 }
 
-void kvm_arm_steal_time_finalize(ARMCPU *cpu, Error **errp)
+bool kvm_arm_steal_time_finalize(ARMCPU *cpu, Error **errp)
 {
     bool has_steal_time = kvm_arm_steal_time_supported();
 
@@ -691,7 +691,7 @@ void kvm_arm_steal_time_finalize(ARMCPU *cpu, Error **errp)
         if (!has_steal_time) {
             error_setg(errp, "'kvm-steal-time' cannot be enabled "
                              "on this host");
-            return;
+            return false;
         } else if (!arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) {
             /*
              * DEN0057A chapter 2 says "This specification only covers
@@ -702,9 +702,10 @@ void kvm_arm_steal_time_finalize(ARMCPU *cpu, Error **errp)
              */
             error_setg(errp, "'kvm-steal-time' cannot be enabled "
                              "for AArch32 guests");
-            return;
+            return false;
         }
     }
+    return true;
 }
 
 bool kvm_arm_aarch32_supported(void)
diff --git a/target/arm/monitor.c b/target/arm/monitor.c
index 0c72bf7c31..8a31c4dd04 100644
--- a/target/arm/monitor.c
+++ b/target/arm/monitor.c
@@ -184,9 +184,11 @@ CpuModelExpansionInfo 
*qmp_query_cpu_model_expansion(CpuModelExpansionType type,
         if (!err) {
             visit_check_struct(visitor, &err);
         }
+#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);
         visit_free(visitor);
         if (err) {
@@ -195,7 +197,9 @@ CpuModelExpansionInfo 
*qmp_query_cpu_model_expansion(CpuModelExpansionType type,
             return NULL;
         }
     } else {
-        arm_cpu_finalize_features(ARM_CPU(obj), &error_abort);
+#ifdef TARGET_AARCH64
+        aarch64_cpu_finalize_features(ARM_CPU(obj), &error_abort);
+#endif /* TARGET_AARCH64 */
     }
 
     expansion_info = g_new0(CpuModelExpansionInfo, 1);
-- 
2.26.2