| Message ID | 20231114235628.534334-4-gshan@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Unified CPU type check | expand |
On 11/14/23 15:56, Gavin Shan wrote: > From: Philippe Mathieu-Daudé <philmd@linaro.org> > > For all targets, the CPU class returned from CPUClass::class_by_name() > and object_class_dynamic_cast(oc, CPU_RESOLVING_TYPE) need to be > compatible. Lets apply the check in cpu_class_by_name() for once, > instead of having the check in CPUClass::class_by_name() for individual > target. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Reviewed-by: Gavin Shan <gshan@redhat.com> > Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > hw/core/cpu-common.c | 8 +++++--- > target/alpha/cpu.c | 3 --- > target/arm/cpu.c | 4 +--- > target/avr/cpu.c | 8 +------- > target/cris/cpu.c | 4 +--- > target/hexagon/cpu.c | 4 +--- > target/hppa/cpu.c | 7 +------ > target/loongarch/cpu.c | 8 +------- > target/m68k/cpu.c | 4 +--- > target/openrisc/cpu.c | 4 +--- > target/riscv/cpu.c | 4 +--- > target/tricore/cpu.c | 4 +--- > target/xtensa/cpu.c | 4 +--- > 13 files changed, 16 insertions(+), 50 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On 15/11/23 00:56, Gavin Shan wrote: > From: Philippe Mathieu-Daudé <philmd@linaro.org> > > For all targets, the CPU class returned from CPUClass::class_by_name() > and object_class_dynamic_cast(oc, CPU_RESOLVING_TYPE) need to be > compatible. Lets apply the check in cpu_class_by_name() for once, > instead of having the check in CPUClass::class_by_name() for individual > target. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Reviewed-by: Gavin Shan <gshan@redhat.com> > Reviewed-by: Igor Mammedov <imammedo@redhat.com> Gavin, this patch is missing your S-o-b tag. Do you mind responding to this email with it? Thanks! > --- > hw/core/cpu-common.c | 8 +++++--- > target/alpha/cpu.c | 3 --- > target/arm/cpu.c | 4 +--- > target/avr/cpu.c | 8 +------- > target/cris/cpu.c | 4 +--- > target/hexagon/cpu.c | 4 +--- > target/hppa/cpu.c | 7 +------ > target/loongarch/cpu.c | 8 +------- > target/m68k/cpu.c | 4 +--- > target/openrisc/cpu.c | 4 +--- > target/riscv/cpu.c | 4 +--- > target/tricore/cpu.c | 4 +--- > target/xtensa/cpu.c | 4 +--- > 13 files changed, 16 insertions(+), 50 deletions(-)
Hi Phil, On 11/17/23 02:08, Philippe Mathieu-Daudé wrote: > On 15/11/23 00:56, Gavin Shan wrote: >> From: Philippe Mathieu-Daudé <philmd@linaro.org> >> >> For all targets, the CPU class returned from CPUClass::class_by_name() >> and object_class_dynamic_cast(oc, CPU_RESOLVING_TYPE) need to be >> compatible. Lets apply the check in cpu_class_by_name() for once, >> instead of having the check in CPUClass::class_by_name() for individual >> target. >> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> >> Reviewed-by: Gavin Shan <gshan@redhat.com> >> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > > Gavin, this patch is missing your S-o-b tag. Do you mind responding to > this email with it? Thanks! > Yes, please add my s-o-b if you need: Signed-off-by: Gavin Shan <gshan@redhat.com> Thanks, Gavin >> --- >> hw/core/cpu-common.c | 8 +++++--- >> target/alpha/cpu.c | 3 --- >> target/arm/cpu.c | 4 +--- >> target/avr/cpu.c | 8 +------- >> target/cris/cpu.c | 4 +--- >> target/hexagon/cpu.c | 4 +--- >> target/hppa/cpu.c | 7 +------ >> target/loongarch/cpu.c | 8 +------- >> target/m68k/cpu.c | 4 +--- >> target/openrisc/cpu.c | 4 +--- >> target/riscv/cpu.c | 4 +--- >> target/tricore/cpu.c | 4 +--- >> target/xtensa/cpu.c | 4 +--- >> 13 files changed, 16 insertions(+), 50 deletions(-) >
diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c index 82dae51a55..d0e7bbdf06 100644 --- a/hw/core/cpu-common.c +++ b/hw/core/cpu-common.c @@ -154,10 +154,12 @@ ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model) assert(cc->class_by_name); assert(cpu_model); oc = cc->class_by_name(cpu_model); - if (oc == NULL || object_class_is_abstract(oc)) { - return NULL; + if (object_class_dynamic_cast(oc, typename) && + !object_class_is_abstract(oc)) { + return oc; } - return oc; + + return NULL; } static void cpu_common_parse_features(const char *typename, char *features, diff --git a/target/alpha/cpu.c b/target/alpha/cpu.c index 91fe8ae095..83345c5c7d 100644 --- a/target/alpha/cpu.c +++ b/target/alpha/cpu.c @@ -141,9 +141,6 @@ 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 || !object_class_dynamic_cast(oc, TYPE_ALPHA_CPU)) { - return NULL; - } return oc; } diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 25e9d2ae7b..4af33b9ada 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -2401,9 +2401,7 @@ static ObjectClass *arm_cpu_class_by_name(const char *cpu_model) oc = object_class_by_name(typename); g_strfreev(cpuname); g_free(typename); - if (!oc || !object_class_dynamic_cast(oc, TYPE_ARM_CPU)) { - return NULL; - } + return oc; } diff --git a/target/avr/cpu.c b/target/avr/cpu.c index 44de1e18d1..a36cc48aae 100644 --- a/target/avr/cpu.c +++ b/target/avr/cpu.c @@ -154,13 +154,7 @@ static void avr_cpu_initfn(Object *obj) static ObjectClass *avr_cpu_class_by_name(const char *cpu_model) { - ObjectClass *oc; - - oc = object_class_by_name(cpu_model); - if (object_class_dynamic_cast(oc, TYPE_AVR_CPU) == NULL) { - oc = NULL; - } - return oc; + return object_class_by_name(cpu_model); } static void avr_cpu_dump_state(CPUState *cs, FILE *f, int flags) diff --git a/target/cris/cpu.c b/target/cris/cpu.c index 675b73ac04..a5083a0077 100644 --- a/target/cris/cpu.c +++ b/target/cris/cpu.c @@ -95,9 +95,7 @@ static ObjectClass *cris_cpu_class_by_name(const char *cpu_model) typename = g_strdup_printf(CRIS_CPU_TYPE_NAME("%s"), cpu_model); oc = object_class_by_name(typename); g_free(typename); - if (oc != NULL && !object_class_dynamic_cast(oc, TYPE_CRIS_CPU)) { - oc = NULL; - } + return oc; } diff --git a/target/hexagon/cpu.c b/target/hexagon/cpu.c index 9d1ffc3b4b..aa48f5fe89 100644 --- a/target/hexagon/cpu.c +++ b/target/hexagon/cpu.c @@ -63,9 +63,7 @@ static ObjectClass *hexagon_cpu_class_by_name(const char *cpu_model) oc = object_class_by_name(typename); g_strfreev(cpuname); g_free(typename); - if (!oc || !object_class_dynamic_cast(oc, TYPE_HEXAGON_CPU)) { - return NULL; - } + return oc; } diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c index fc4d2abad7..1a5fb6c65b 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -160,13 +160,8 @@ static void hppa_cpu_initfn(Object *obj) static ObjectClass *hppa_cpu_class_by_name(const char *cpu_model) { g_autofree char *typename = g_strconcat(cpu_model, "-cpu", NULL); - ObjectClass *oc = object_class_by_name(typename); - if (oc && - object_class_dynamic_cast(oc, TYPE_HPPA_CPU)) { - return oc; - } - return NULL; + return object_class_by_name(typename); } static void hppa_cpu_list_entry(gpointer data, gpointer user_data) diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c index fc075952e6..6fdf5e60f5 100644 --- a/target/loongarch/cpu.c +++ b/target/loongarch/cpu.c @@ -716,15 +716,9 @@ static ObjectClass *loongarch_cpu_class_by_name(const char *cpu_model) g_autofree char *typename = g_strdup_printf(LOONGARCH_CPU_TYPE_NAME("%s"), cpu_model); oc = object_class_by_name(typename); - if (!oc) { - return NULL; - } } - if (object_class_dynamic_cast(oc, TYPE_LOONGARCH_CPU)) { - return oc; - } - return NULL; + return oc; } void loongarch_cpu_dump_state(CPUState *cs, FILE *f, int flags) diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c index 11c7e0a790..6cd5b56d6f 100644 --- a/target/m68k/cpu.c +++ b/target/m68k/cpu.c @@ -111,9 +111,7 @@ static ObjectClass *m68k_cpu_class_by_name(const char *cpu_model) typename = g_strdup_printf(M68K_CPU_TYPE_NAME("%s"), cpu_model); oc = object_class_by_name(typename); g_free(typename); - if (oc != NULL && object_class_dynamic_cast(oc, TYPE_M68K_CPU) == NULL) { - return NULL; - } + return oc; } diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c index 1173260017..f7d53c592a 100644 --- a/target/openrisc/cpu.c +++ b/target/openrisc/cpu.c @@ -164,9 +164,7 @@ static ObjectClass *openrisc_cpu_class_by_name(const char *cpu_model) typename = g_strdup_printf(OPENRISC_CPU_TYPE_NAME("%s"), cpu_model); oc = object_class_by_name(typename); g_free(typename); - if (oc != NULL && !object_class_dynamic_cast(oc, TYPE_OPENRISC_CPU)) { - return NULL; - } + return oc; } diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 83c7c0cf07..523e9a16ea 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -646,9 +646,7 @@ static ObjectClass *riscv_cpu_class_by_name(const char *cpu_model) oc = object_class_by_name(typename); g_strfreev(cpuname); g_free(typename); - if (!oc || !object_class_dynamic_cast(oc, TYPE_RISCV_CPU)) { - return NULL; - } + return oc; } diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c index 034e01c189..8acacdf0c0 100644 --- a/target/tricore/cpu.c +++ b/target/tricore/cpu.c @@ -132,9 +132,7 @@ static ObjectClass *tricore_cpu_class_by_name(const char *cpu_model) typename = g_strdup_printf(TRICORE_CPU_TYPE_NAME("%s"), cpu_model); oc = object_class_by_name(typename); g_free(typename); - if (!oc || !object_class_dynamic_cast(oc, TYPE_TRICORE_CPU)) { - return NULL; - } + return oc; } diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c index e20fe87bf2..93e782a6e0 100644 --- a/target/xtensa/cpu.c +++ b/target/xtensa/cpu.c @@ -141,9 +141,7 @@ 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)) { - return NULL; - } + return oc; }