Improve xtensa_cpu_class_by_name() by merging the condition of '@oc == NULL' to object_class_dynamic_cast().
Signed-off-by: Gavin Shan <gs...@redhat.com> --- target/xtensa/cpu.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c index acaf8c905f..9d682611aa 100644 --- a/target/xtensa/cpu.c +++ b/target/xtensa/cpu.c @@ -141,11 +141,12 @@ static ObjectClass *xtensa_cpu_class_by_name(const char *cpu_model) typename = g_strdup_printf(XTENSA_CPU_TYPE_NAME("%s"), cpu_model); oc = object_class_by_name(typename); g_free(typename); - if (oc == NULL || !object_class_dynamic_cast(oc, TYPE_XTENSA_CPU) || - object_class_is_abstract(oc)) { - return NULL; + if (object_class_dynamic_cast(oc, TYPE_XTENSA_CPU) && + !object_class_is_abstract(oc)) { + return oc; } - return oc; + + return NULL; } static void xtensa_cpu_disas_set_info(CPUState *cs, disassemble_info *info) -- 2.41.0