From: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: Fri, 8 Sep 2023 09:29:17 +0000 (+0200)
Subject: target/alpha: Tidy up alpha_cpu_class_by_name()
X-Git-Tag: v8.2.0-rc0~19^2~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=55f2cd77376c6f2187ff386ab3b330ef260eedb2;p=thirdparty%2Fqemu.git

target/alpha: Tidy up alpha_cpu_class_by_name()

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Message-Id: <20230908112235.75914-2-philmd@linaro.org>
---

diff --git a/target/alpha/cpu.c b/target/alpha/cpu.c
index 51b7d8d1bf6..fae2cb6ec74 100644
--- a/target/alpha/cpu.c
+++ b/target/alpha/cpu.c
@@ -142,13 +142,10 @@ static ObjectClass *alpha_cpu_class_by_name(const char *cpu_model)
     typename = g_strdup_printf(ALPHA_CPU_TYPE_NAME("%s"), cpu_model);
     oc = object_class_by_name(typename);
     g_free(typename);
-    if (oc != NULL && object_class_is_abstract(oc)) {
-        oc = NULL;
-    }
 
     /* TODO: remove match everything nonsense */
-    /* Default to ev67; no reason not to emulate insns by default. */
-    if (!oc) {
+    if (!oc || object_class_is_abstract(oc)) {
+        /* Default to ev67; no reason not to emulate insns by default. */
         oc = object_class_by_name(ALPHA_CPU_TYPE_NAME("ev67"));
     }