From: Gavin Shan <gshan@redhat.com>
To: qemu-arm@nongnu.org
Cc: qemu-devel@nongnu.org, qemu-riscv@nongnu.org,
qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, philmd@linaro.org,
clg@kaod.org, imammedo@redhat.com, imp@bsdimp.com,
kevans@freebsd.org, richard.henderson@linaro.org,
pbonzini@redhat.com, peter.maydell@linaro.org,
b.galvani@gmail.com, strahinja.p.jankovic@gmail.com,
sundeep.lkml@gmail.com, kfting@nuvoton.com, wuhaotsh@google.com,
nieklinnenbank@gmail.com, rad@semihalf.com,
quic_llindhol@quicinc.com, marcin.juszkiewicz@linaro.org,
eduardo@habkost.net, marcel.apfelbaum@gmail.com,
wangyanan55@huawei.com, laurent@vivier.eu, vijai@behindbytes.com,
palmer@dabbelt.com, alistair.francis@wdc.com,
bin.meng@windriver.com, liweiwei@iscas.ac.cn,
dbarboza@ventanamicro.com, zhiwei_liu@linux.alibaba.com,
mrolnik@gmail.com, edgar.iglesias@gmail.com, bcain@quicinc.com,
gaosong@loongson.cn, aurelien@aurel32.net,
jiaxun.yang@flygoat.com, aleksandar.rikalo@syrmia.com,
chenhuacai@kernel.org, crwulff@gmail.com, marex@denx.de,
shorne@gmail.com, npiggin@gmail.com, ysato@users.sourceforge.jp,
david@redhat.com, thuth@redhat.com, iii@linux.ibm.com,
kbastian@mail.uni-paderborn.de, jcmvbkbc@gmail.com,
shan.gavin@gmail.com
Subject: [PATCH v4 02/33] hw/cpu: Call object_class_is_abstract() once in cpu_class_by_name()
Date: Thu, 2 Nov 2023 10:24:29 +1000 [thread overview]
Message-ID: <20231102002500.1750692-3-gshan@redhat.com> (raw)
In-Reply-To: <20231102002500.1750692-1-gshan@redhat.com>
From: Philippe Mathieu-Daudé <philmd@linaro.org>
Let CPUClass::class_by_name() handlers to return abstract classes,
and filter them once in the public cpu_class_by_name() method.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Gavin Shan <gshan@redhat.com>
---
hw/core/cpu-common.c | 8 +++++++-
include/hw/core/cpu.h | 7 ++++---
target/alpha/cpu.c | 2 +-
target/arm/cpu.c | 3 +--
target/avr/cpu.c | 3 +--
target/cris/cpu.c | 3 +--
target/hexagon/cpu.c | 3 +--
target/loongarch/cpu.c | 3 +--
target/m68k/cpu.c | 3 +--
target/openrisc/cpu.c | 3 +--
target/riscv/cpu.c | 3 +--
target/rx/cpu.c | 5 +----
target/sh4/cpu.c | 3 ---
target/tricore/cpu.c | 3 +--
target/xtensa/cpu.c | 3 +--
15 files changed, 23 insertions(+), 32 deletions(-)
diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c
index bab8942c30..bca0323e9f 100644
--- a/hw/core/cpu-common.c
+++ b/hw/core/cpu-common.c
@@ -150,9 +150,15 @@ static bool cpu_common_has_work(CPUState *cs)
ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model)
{
CPUClass *cc = CPU_CLASS(object_class_by_name(typename));
+ ObjectClass *oc;
assert(cpu_model && cc->class_by_name);
- return cc->class_by_name(cpu_model);
+ oc = cc->class_by_name(cpu_model);
+ if (oc && !object_class_is_abstract(oc)) {
+ return oc;
+ }
+
+ return NULL;
}
static void cpu_common_parse_features(const char *typename, char *features,
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
index 18593db5b2..ee85aafdf5 100644
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -102,7 +102,7 @@ struct SysemuCPUOps;
/**
* CPUClass:
* @class_by_name: Callback to map -cpu command line model name to an
- * instantiatable CPU type.
+ * instantiatable CPU type.
* @parse_features: Callback to parse command line arguments.
* @reset_dump_flags: #CPUDumpFlags to use for reset logging.
* @has_work: Callback for checking if there is work to do.
@@ -772,9 +772,10 @@ void cpu_reset(CPUState *cpu);
* @typename: The CPU base type.
* @cpu_model: The model string without any parameters.
*
- * Looks up a CPU #ObjectClass matching name @cpu_model.
+ * Looks up a concrete CPU #ObjectClass matching name @cpu_model.
*
- * Returns: A #CPUClass or %NULL if not matching class is found.
+ * Returns: A concrete #CPUClass or %NULL if no matching class is found
+ * or if the matching class is abstract.
*/
ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model);
diff --git a/target/alpha/cpu.c b/target/alpha/cpu.c
index c7ae4d6a41..9436859c7b 100644
--- a/target/alpha/cpu.c
+++ b/target/alpha/cpu.c
@@ -126,7 +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 &&
+ if (object_class_dynamic_cast(oc, TYPE_ALPHA_CPU) &&
!object_class_is_abstract(oc)) {
return oc;
}
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index 954328d72a..8c622d6b59 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -2399,8 +2399,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) ||
- object_class_is_abstract(oc)) {
+ if (!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 14d8b9d1f0..113d522f75 100644
--- a/target/avr/cpu.c
+++ b/target/avr/cpu.c
@@ -157,8 +157,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 ||
- object_class_is_abstract(oc)) {
+ if (!object_class_dynamic_cast(oc, TYPE_AVR_CPU)) {
oc = NULL;
}
return oc;
diff --git a/target/cris/cpu.c b/target/cris/cpu.c
index be4a44c218..1cb431cd46 100644
--- a/target/cris/cpu.c
+++ b/target/cris/cpu.c
@@ -95,8 +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) ||
- object_class_is_abstract(oc))) {
+ if (!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 1adc11b713..bd5adb7acd 100644
--- a/target/hexagon/cpu.c
+++ b/target/hexagon/cpu.c
@@ -63,8 +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) ||
- object_class_is_abstract(oc)) {
+ if (!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 ef1bf89dac..06d1b9bb95 100644
--- a/target/loongarch/cpu.c
+++ b/target/loongarch/cpu.c
@@ -648,8 +648,7 @@ static ObjectClass *loongarch_cpu_class_by_name(const char *cpu_model)
}
}
- if (object_class_dynamic_cast(oc, TYPE_LOONGARCH_CPU)
- && !object_class_is_abstract(oc)) {
+ if (object_class_dynamic_cast(oc, TYPE_LOONGARCH_CPU)) {
return oc;
}
return NULL;
diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c
index 538d9473c2..fe381cc5d3 100644
--- a/target/m68k/cpu.c
+++ b/target/m68k/cpu.c
@@ -111,8 +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 ||
- object_class_is_abstract(oc))) {
+ if (!object_class_dynamic_cast(oc, TYPE_M68K_CPU)) {
return NULL;
}
return oc;
diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c
index f5a3d5273b..cc94f37e77 100644
--- a/target/openrisc/cpu.c
+++ b/target/openrisc/cpu.c
@@ -164,8 +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) ||
- object_class_is_abstract(oc))) {
+ if (!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 ac4a6c7eec..018bad6f82 100644
--- a/target/riscv/cpu.c
+++ b/target/riscv/cpu.c
@@ -636,8 +636,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) ||
- object_class_is_abstract(oc)) {
+ if (!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 4d0d3a0c8c..0063837e93 100644
--- a/target/rx/cpu.c
+++ b/target/rx/cpu.c
@@ -111,16 +111,13 @@ 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 (object_class_dynamic_cast(oc, TYPE_RX_CPU) &&
!object_class_is_abstract(oc)) {
return oc;
}
typename = g_strdup_printf(RX_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;
- }
return oc;
}
diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c
index 788e41fea6..a8ec98b134 100644
--- a/target/sh4/cpu.c
+++ b/target/sh4/cpu.c
@@ -152,9 +152,6 @@ static ObjectClass *superh_cpu_class_by_name(const char *cpu_model)
typename = g_strdup_printf(SUPERH_CPU_TYPE_NAME("%s"), s);
oc = object_class_by_name(typename);
- if (oc != NULL && object_class_is_abstract(oc)) {
- oc = NULL;
- }
out:
g_free(s);
diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c
index 5ca666ee12..47e1c272cf 100644
--- a/target/tricore/cpu.c
+++ b/target/tricore/cpu.c
@@ -132,8 +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) ||
- object_class_is_abstract(oc)) {
+ if (!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 ea1dae7390..5d1c090467 100644
--- a/target/xtensa/cpu.c
+++ b/target/xtensa/cpu.c
@@ -141,8 +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) ||
- object_class_is_abstract(oc)) {
+ if (!object_class_dynamic_cast(oc, TYPE_XTENSA_CPU)) {
return NULL;
}
return oc;
--
2.41.0
next prev parent reply other threads:[~2023-11-02 0:29 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-02 0:24 [PATCH v4 00/33] Unified CPU type check Gavin Shan
2023-11-02 0:24 ` [PATCH v4 01/33] target/alpha: Tidy up alpha_cpu_class_by_name() Gavin Shan
2023-11-06 14:22 ` Igor Mammedov
2023-11-13 23:23 ` Gavin Shan
2023-11-02 0:24 ` Gavin Shan [this message]
2023-11-06 14:40 ` [PATCH v4 02/33] hw/cpu: Call object_class_is_abstract() once in cpu_class_by_name() Igor Mammedov
2023-11-13 23:46 ` Gavin Shan
2023-11-02 0:24 ` [PATCH v4 03/33] cpu: Call object_class_dynamic_cast() " Gavin Shan
2023-11-06 14:48 ` Igor Mammedov
2023-11-02 0:24 ` [PATCH v4 04/33] cpu: Add helper cpu_model_from_type() Gavin Shan
2023-11-02 0:24 ` [PATCH v4 05/33] target/alpha: Use generic helper to show CPU model names Gavin Shan
2023-11-02 0:24 ` [PATCH v4 06/33] target/arm: " Gavin Shan
2023-11-02 0:24 ` [PATCH v4 07/33] target/avr: " Gavin Shan
2023-11-02 0:24 ` [PATCH v4 08/33] target/cris: " Gavin Shan
2023-11-02 0:24 ` [PATCH v4 09/33] target/hexagon: " Gavin Shan
2023-11-02 0:24 ` [PATCH v4 10/33] target/i386: " Gavin Shan
2023-11-02 0:24 ` [PATCH v4 11/33] target/loongarch: " Gavin Shan
2023-11-02 0:24 ` [PATCH v4 12/33] target/m68k: " Gavin Shan
2023-11-02 0:24 ` [PATCH v4 13/33] target/mips: " Gavin Shan
2023-11-02 0:24 ` [PATCH v4 14/33] target/openrisc: " Gavin Shan
2023-11-02 0:24 ` [PATCH v4 15/33] target/ppc: " Gavin Shan
2023-11-02 0:24 ` [PATCH v4 16/33] target/riscv: " Gavin Shan
2023-11-02 0:24 ` [PATCH v4 17/33] target/rx: " Gavin Shan
2023-11-02 0:24 ` [PATCH v4 18/33] target/s390x: " Gavin Shan
2023-11-02 0:24 ` [PATCH v4 19/33] target/sh4: " Gavin Shan
2023-11-02 0:24 ` [PATCH v4 20/33] target/tricore: " Gavin Shan
2023-11-02 0:24 ` [PATCH v4 21/33] target/hppa: Implement hppa_cpu_list() Gavin Shan
2023-11-02 0:24 ` [PATCH v4 22/33] target/microblaze: Implement microblaze_cpu_list() Gavin Shan
2023-11-02 0:24 ` [PATCH v4 23/33] target/nios2: Implement nios2_cpu_list() Gavin Shan
2023-11-02 0:24 ` [PATCH v4 24/33] cpu: Mark cpu_list() supported on all targets Gavin Shan
2023-11-02 0:24 ` [PATCH v4 25/33] machine: Constify MachineClass::valid_cpu_types[i] Gavin Shan
2023-11-02 4:14 ` Richard Henderson
2023-11-02 0:24 ` [PATCH v4 26/33] machine: Use error handling when CPU type is checked Gavin Shan
2023-11-02 4:57 ` Richard Henderson
2023-11-02 0:24 ` [PATCH v4 27/33] machine: Introduce helper is_cpu_type_supported() Gavin Shan
2023-11-02 5:02 ` Richard Henderson
2023-11-02 0:24 ` [PATCH v4 28/33] machine: Print CPU model name instead of CPU type name Gavin Shan
2023-11-02 5:06 ` Richard Henderson
2023-11-02 0:24 ` [PATCH v4 29/33] hw/arm/virt: Check CPU type in machine_run_board_init() Gavin Shan
2023-11-02 5:09 ` Richard Henderson
2023-11-02 0:24 ` [PATCH v4 30/33] hw/arm/virt: Hide host CPU model for tcg Gavin Shan
2023-11-02 5:10 ` Richard Henderson
2023-11-02 0:24 ` [PATCH v4 31/33] hw/arm/sbsa-ref: Check CPU type in machine_run_board_init() Gavin Shan
2023-11-02 5:15 ` Richard Henderson
2023-11-02 0:24 ` [PATCH v4 32/33] hw/arm: " Gavin Shan
2023-11-02 5:17 ` Richard Henderson
2023-11-02 0:25 ` [PATCH v4 33/33] hw/riscv/shakti_c: " Gavin Shan
2023-11-02 5:19 ` Richard Henderson
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=20231102002500.1750692-3-gshan@redhat.com \
--to=gshan@redhat.com \
--cc=aleksandar.rikalo@syrmia.com \
--cc=alistair.francis@wdc.com \
--cc=aurelien@aurel32.net \
--cc=b.galvani@gmail.com \
--cc=bcain@quicinc.com \
--cc=bin.meng@windriver.com \
--cc=chenhuacai@kernel.org \
--cc=clg@kaod.org \
--cc=crwulff@gmail.com \
--cc=david@redhat.com \
--cc=dbarboza@ventanamicro.com \
--cc=edgar.iglesias@gmail.com \
--cc=eduardo@habkost.net \
--cc=gaosong@loongson.cn \
--cc=iii@linux.ibm.com \
--cc=imammedo@redhat.com \
--cc=imp@bsdimp.com \
--cc=jcmvbkbc@gmail.com \
--cc=jiaxun.yang@flygoat.com \
--cc=kbastian@mail.uni-paderborn.de \
--cc=kevans@freebsd.org \
--cc=kfting@nuvoton.com \
--cc=laurent@vivier.eu \
--cc=liweiwei@iscas.ac.cn \
--cc=marcel.apfelbaum@gmail.com \
--cc=marcin.juszkiewicz@linaro.org \
--cc=marex@denx.de \
--cc=mrolnik@gmail.com \
--cc=nieklinnenbank@gmail.com \
--cc=npiggin@gmail.com \
--cc=palmer@dabbelt.com \
--cc=pbonzini@redhat.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=quic_llindhol@quicinc.com \
--cc=rad@semihalf.com \
--cc=richard.henderson@linaro.org \
--cc=shan.gavin@gmail.com \
--cc=shorne@gmail.com \
--cc=strahinja.p.jankovic@gmail.com \
--cc=sundeep.lkml@gmail.com \
--cc=thuth@redhat.com \
--cc=vijai@behindbytes.com \
--cc=wangyanan55@huawei.com \
--cc=wuhaotsh@google.com \
--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).