From: Gavin Shan <gshan@redhat.com>
To: "Philippe Mathieu-Daudé" <philmd@linaro.org>,
qemu-devel@nongnu.org, "David Hildenbrand" <david@redhat.com>
Cc: "Chris Wulff" <crwulff@gmail.com>,
"David Gibson" <david@gibson.dropbear.id.au>,
qemu-s390x@nongnu.org, "Weiwei Li" <liweiwei@iscas.ac.cn>,
qemu-arm@nongnu.org,
"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
"Jiaxun Yang" <jiaxun.yang@flygoat.com>,
"Yoshinori Sato" <ysato@users.sourceforge.jp>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Max Filippov" <jcmvbkbc@gmail.com>,
"Nicholas Piggin" <npiggin@gmail.com>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Ilya Leoshkevich" <iii@linux.ibm.com>,
"Bastian Koppelmann" <kbastian@mail.uni-paderborn.de>,
"Greg Kurz" <groug@kaod.org>,
"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
qemu-ppc@nongnu.org,
"Daniel Henrique Barboza" <dbarboza@ventanamicro.com>,
"Marek Vasut" <marex@denx.de>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Michael Rolnik" <mrolnik@gmail.com>,
"Laurent Vivier" <laurent@vivier.eu>,
"Peter Maydell" <peter.maydell@linaro.org>,
qemu-riscv@nongnu.org, "Aurelien Jarno" <aurelien@aurel32.net>,
"Bin Meng" <bin.meng@windriver.com>,
"Xiaojuan Yang" <yangxiaojuan@loongson.cn>,
"Daniel Henrique Barboza" <danielhb413@gmail.com>,
"Aleksandar Rikalo" <aleksandar.rikalo@syrmia.com>,
"Artyom Tarasenko" <atar4qemu@gmail.com>,
"Song Gao" <gaosong@loongson.cn>,
"Stafford Horne" <shorne@gmail.com>,
"Yanan Wang" <wangyanan55@huawei.com>,
"Alistair Francis" <alistair.francis@wdc.com>,
"Brian Cain" <bcain@quicinc.com>,
"Cédric Le Goater" <clg@kaod.org>,
"Thomas Huth" <thuth@redhat.com>,
"Liu Zhiwei" <zhiwei_liu@linux.alibaba.com>
Subject: Re: [PATCH 4/4] hw/cpu: Call object_class_dynamic_cast() once in cpu_class_by_name()
Date: Mon, 11 Sep 2023 09:40:16 +1000 [thread overview]
Message-ID: <78b44397-dcc4-c795-a5f2-c5fd7003e267@redhat.com> (raw)
In-Reply-To: <20230908112235.75914-5-philmd@linaro.org>
On 9/8/23 21:22, Philippe Mathieu-Daudé wrote:
> Leverage the public CPUClass::cpu_resolving_type field and
> call object_class_dynamic_cast() once in cpu_class_by_name().
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> hw/core/cpu-common.c | 3 ++-
> target/alpha/cpu.c | 3 +--
> target/arm/cpu.c | 4 +---
> target/avr/cpu.c | 4 +---
> target/cris/cpu.c | 4 +---
> target/hexagon/cpu.c | 4 +---
> target/loongarch/cpu.c | 5 +----
> target/m68k/cpu.c | 4 +---
> target/openrisc/cpu.c | 4 +---
> target/riscv/cpu.c | 4 +---
> target/rx/cpu.c | 2 +-
> target/tricore/cpu.c | 4 +---
> target/xtensa/cpu.c | 4 +---
> 13 files changed, 14 insertions(+), 35 deletions(-)
>
> diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c
> index 2d24261a6a..f4a2ccebea 100644
> --- a/hw/core/cpu-common.c
> +++ b/hw/core/cpu-common.c
> @@ -157,7 +157,8 @@ ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model)
> cc = CPU_CLASS(oc);
> assert(cc->cpu_resolving_type && cc->class_by_name);
> oc = cc->class_by_name(cpu_model);
> - if (oc == NULL || object_class_is_abstract(oc)) {
> + if (oc == NULL || object_class_is_abstract(oc)
> + || !object_class_dynamic_cast(oc, cc->cpu_resolving_type)) {
> return NULL;
> }
> return oc;
Alignment.
if (!oc || object_class_is_abstract(oc) ||
!object_class_dynamic_cast(oc, cc->cpu_resolving_type)) {
> diff --git a/target/alpha/cpu.c b/target/alpha/cpu.c
> index 0ddea8004c..b184fcc123 100644
> --- a/target/alpha/cpu.c
> +++ b/target/alpha/cpu.c
> @@ -126,8 +126,7 @@ static ObjectClass *alpha_cpu_class_by_name(const char *cpu_model)
> int i;
>
> oc = object_class_by_name(cpu_model);
> - if (oc != NULL && object_class_dynamic_cast(oc, TYPE_ALPHA_CPU) != NULL &&
> - !object_class_is_abstract(oc)) {
> + if (oc != NULL && !object_class_is_abstract(oc)) {
> return oc;
> }
>
No, the check "!object_class_is_abstract(oc)" for this level can't be dropped.
The same check for the last level can be dropped because it's going to be
covered by hw/core/cpu-common.c::cpu_class_by_name().
> diff --git a/target/arm/cpu.c b/target/arm/cpu.c
> index 9e51bde170..d29040cd8c 100644
> --- a/target/arm/cpu.c
> +++ b/target/arm/cpu.c
> @@ -2300,9 +2300,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 f6004169ac..53735ff1dd 100644
> --- a/target/avr/cpu.c
> +++ b/target/avr/cpu.c
> @@ -159,9 +159,7 @@ 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;
> }
>
> diff --git a/target/cris/cpu.c b/target/cris/cpu.c
> index adde4f599d..b307d0b9db 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 2d4fed838d..4b8d63c4a7 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/loongarch/cpu.c b/target/loongarch/cpu.c
> index 189dfd32d1..1eb2c579eb 100644
> --- a/target/loongarch/cpu.c
> +++ b/target/loongarch/cpu.c
> @@ -646,10 +646,7 @@ static ObjectClass *loongarch_cpu_class_by_name(const char *cpu_model)
> }
> }
>
> - 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 bd7bb103d7..e8b86c80f1 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 5e1e0576e0..7aac9105bd 100644
> --- a/target/openrisc/cpu.c
> +++ b/target/openrisc/cpu.c
> @@ -168,9 +168,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 e8f04ef82b..0170e288e7 100644
> --- a/target/riscv/cpu.c
> +++ b/target/riscv/cpu.c
> @@ -619,9 +619,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/rx/cpu.c b/target/rx/cpu.c
> index 2a6df418a8..879d4fcdef 100644
> --- a/target/rx/cpu.c
> +++ b/target/rx/cpu.c
> @@ -111,7 +111,7 @@ static ObjectClass *rx_cpu_class_by_name(const char *cpu_model)
> char *typename;
>
> oc = object_class_by_name(cpu_model);
> - if (oc != NULL && object_class_dynamic_cast(oc, TYPE_RX_CPU) != NULL) {
> + if (oc != NULL) {
> return oc;
> }
> typename = g_strdup_printf(RX_CPU_TYPE_NAME("%s"), cpu_model);
Same as above. The check (object_class_dynamic_cast()) can't be dropped in
this level. Besides, the check object_class_is_abstract() is missed for this
level.
> diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c
> index ffe5158786..f65b8761b0 100644
> --- a/target/tricore/cpu.c
> +++ b/target/tricore/cpu.c
> @@ -140,9 +140,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 13bed05d0c..6d96e5ab27 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;
> }
>
Thanks,
Gavin
prev parent reply other threads:[~2023-09-10 23:41 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-08 11:22 [PATCH 0/4] hw/core/cpu-common: Consolidate cpu_class_by_name() Philippe Mathieu-Daudé
2023-09-08 11:22 ` [PATCH 1/4] target/alpha: Tidy up alpha_cpu_class_by_name() Philippe Mathieu-Daudé
2023-09-09 22:17 ` Richard Henderson
2023-09-10 23:29 ` Gavin Shan
2023-09-08 11:22 ` [PATCH 2/4] hw/cpu: Call object_class_is_abstract() once in cpu_class_by_name() Philippe Mathieu-Daudé
2023-09-09 22:18 ` Richard Henderson
2023-09-08 11:22 ` [PATCH 3/4] hw/cpu: Introduce CPUClass::cpu_resolving_type field Philippe Mathieu-Daudé
2023-09-09 22:21 ` Richard Henderson
2023-09-10 23:28 ` Gavin Shan
2023-09-11 9:43 ` Philippe Mathieu-Daudé
2023-09-11 10:55 ` Igor Mammedov
2023-09-11 22:40 ` Gavin Shan
2023-09-25 0:24 ` Gavin Shan
2023-10-11 3:28 ` Philippe Mathieu-Daudé
2023-10-11 6:45 ` Gavin Shan
2023-09-08 11:22 ` [PATCH 4/4] hw/cpu: Call object_class_dynamic_cast() once in cpu_class_by_name() Philippe Mathieu-Daudé
2023-09-09 23:26 ` Richard Henderson
2023-09-10 23:40 ` Gavin Shan [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=78b44397-dcc4-c795-a5f2-c5fd7003e267@redhat.com \
--to=gshan@redhat.com \
--cc=aleksandar.rikalo@syrmia.com \
--cc=alistair.francis@wdc.com \
--cc=atar4qemu@gmail.com \
--cc=aurelien@aurel32.net \
--cc=bcain@quicinc.com \
--cc=bin.meng@windriver.com \
--cc=clg@kaod.org \
--cc=crwulff@gmail.com \
--cc=danielhb413@gmail.com \
--cc=david@gibson.dropbear.id.au \
--cc=david@redhat.com \
--cc=dbarboza@ventanamicro.com \
--cc=edgar.iglesias@gmail.com \
--cc=eduardo@habkost.net \
--cc=gaosong@loongson.cn \
--cc=groug@kaod.org \
--cc=iii@linux.ibm.com \
--cc=jcmvbkbc@gmail.com \
--cc=jiaxun.yang@flygoat.com \
--cc=kbastian@mail.uni-paderborn.de \
--cc=laurent@vivier.eu \
--cc=liweiwei@iscas.ac.cn \
--cc=marcel.apfelbaum@gmail.com \
--cc=marex@denx.de \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=mrolnik@gmail.com \
--cc=npiggin@gmail.com \
--cc=palmer@dabbelt.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=shorne@gmail.com \
--cc=thuth@redhat.com \
--cc=wangyanan55@huawei.com \
--cc=yangxiaojuan@loongson.cn \
--cc=ysato@users.sourceforge.jp \
--cc=zhiwei_liu@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).