[PATCH 1/7] target/arm: Tidy cpu_max_initfn

Once we have eliminated hwaccel_enabled, only tcg and qtest remain.
We don't really need to test for it anymore, but convert the if to
and assert.

Remove an assert on aarch64_enabled that is directly protected by
a preceding if.

Signed-off-by: Richard Henderson <[email protected]>
---
 target/arm/cpu-max.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/target/arm/cpu-max.c b/target/arm/cpu-max.c
index 88b7c04633..089f514bd8 100644
--- a/target/arm/cpu-max.c
+++ b/target/arm/cpu-max.c
@@ -203,9 +203,9 @@ static void cpu_max_initfn(Object *obj)
         return;
     }
 
-    if (tcg_enabled() || qtest_enabled()) {
-        aarch64_aa32_a57_init(obj, !aarch64_enabled);
-    }
+    assert(tcg_enabled() || qtest_enabled());
+
+    aarch64_aa32_a57_init(obj, !aarch64_enabled);
 
     if (!aarch64_enabled) {
         aa32_max_features(cpu);
@@ -218,8 +218,7 @@ static void cpu_max_initfn(Object *obj)
          */
         cpu->isar.mvfr0 = FIELD_DP32(cpu->isar.mvfr0, MVFR0, FPSHVEC, 1);
 #endif
-    } else if (tcg_enabled()) {
-        assert(aarch64_enabled);
+    } else {
         /*
          * '-cpu max' for TCG: we currently do this as
          * "A57 with extra things"
-- 
2.43.0