[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-riscv] [Qemu-devel] [PATCH 6/7] cpu: Set class name format for
|
From: |
Alistair Francis |
|
Subject: |
Re: [Qemu-riscv] [Qemu-devel] [PATCH 6/7] cpu: Set class name format for some architectures |
|
Date: |
Fri, 19 Apr 2019 13:59:38 -0700 |
On Thu, Apr 18, 2019 at 11:23 PM Eduardo Habkost <address@hidden> wrote:
>
> Set CPUClass::class_name_format for 12 architectures that simply
> generate a class name using g_strdup_printf(): arm, i386, lm32,
> m68k, mips, moxie, openrisc, riscv, s390x, tricore, unicore32,
> xtensa.
>
> Signed-off-by: Eduardo Habkost <address@hidden>
> ---
> Cc: Peter Maydell <address@hidden>
> Cc: Paolo Bonzini <address@hidden>
> Cc: Richard Henderson <address@hidden>
> Cc: Eduardo Habkost <address@hidden>
> Cc: Michael Walle <address@hidden>
> Cc: Laurent Vivier <address@hidden>
> Cc: Aurelien Jarno <address@hidden>
> Cc: Aleksandar Markovic <address@hidden>
> Cc: Aleksandar Rikalo <address@hidden>
> Cc: Anthony Green <address@hidden>
> Cc: Stafford Horne <address@hidden>
> Cc: Palmer Dabbelt <address@hidden>
> Cc: Alistair Francis <address@hidden>
> Cc: Sagar Karandikar <address@hidden>
> Cc: Bastian Koppelmann <address@hidden>
> Cc: Cornelia Huck <address@hidden>
> Cc: David Hildenbrand <address@hidden>
> Cc: Guan Xuetao <address@hidden>
> Cc: Max Filippov <address@hidden>
> Cc: address@hidden
> Cc: address@hidden
> Cc: address@hidden
For RISC-V:
Reviewed-by: Alistair Francis <address@hidden>
Alistair
> ---
> target/s390x/internal.h | 1 -
> target/arm/cpu.c | 17 +----------------
> target/i386/cpu.c | 11 +----------
> target/lm32/cpu.c | 17 +----------------
> target/m68k/cpu.c | 17 +----------------
> target/mips/cpu.c | 13 +------------
> target/moxie/cpu.c | 17 +----------------
> target/openrisc/cpu.c | 17 +----------------
> target/riscv/cpu.c | 17 +----------------
> target/s390x/cpu.c | 2 +-
> target/s390x/cpu_models.c | 10 ----------
> target/tricore/cpu.c | 17 +----------------
> target/unicore32/cpu.c | 17 +----------------
> target/xtensa/cpu.c | 17 +----------------
> 14 files changed, 12 insertions(+), 178 deletions(-)
>
> diff --git a/target/s390x/internal.h b/target/s390x/internal.h
> index 3b4855c175..789d6444c9 100644
> --- a/target/s390x/internal.h
> +++ b/target/s390x/internal.h
> @@ -256,7 +256,6 @@ static inline void s390_cpu_unhalt(S390CPU *cpu)
> void s390_cpu_model_register_props(Object *obj);
> void s390_cpu_model_class_register_props(ObjectClass *oc);
> void s390_realize_cpu_model(CPUState *cs, Error **errp);
> -ObjectClass *s390_cpu_class_by_name(const char *name);
>
>
> /* excp_helper.c */
> diff --git a/target/arm/cpu.c b/target/arm/cpu.c
> index dcc65093d9..4f0ed3715d 100644
> --- a/target/arm/cpu.c
> +++ b/target/arm/cpu.c
> @@ -1208,21 +1208,6 @@ static void arm_cpu_realizefn(DeviceState *dev, Error
> **errp)
> acc->parent_realize(dev, errp);
> }
>
> -static ObjectClass *arm_cpu_class_by_name(const char *cpu_model)
> -{
> - ObjectClass *oc;
> - char *typename;
> -
> - typename = g_strdup_printf(ARM_CPU_TYPE_NAME("%s"), cpu_model);
> - oc = object_class_by_name(typename);
> - g_free(typename);
> - if (!oc || !object_class_dynamic_cast(oc, TYPE_ARM_CPU) ||
> - object_class_is_abstract(oc)) {
> - return NULL;
> - }
> - return oc;
> -}
> -
> /* CPU models. These are not needed for the AArch64 linux-user build. */
> #if !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64)
>
> @@ -2142,7 +2127,7 @@ static void arm_cpu_class_init(ObjectClass *oc, void
> *data)
> acc->parent_reset = cc->reset;
> cc->reset = arm_cpu_reset;
>
> - cc->class_by_name = arm_cpu_class_by_name;
> + cc->class_name_format = ARM_CPU_TYPE_NAME("%s");
> cc->has_work = arm_cpu_has_work;
> cc->cpu_exec_interrupt = arm_cpu_exec_interrupt;
> cc->dump_state = arm_cpu_dump_state;
> diff --git a/target/i386/cpu.c b/target/i386/cpu.c
> index d6bb57d210..18adef524f 100644
> --- a/target/i386/cpu.c
> +++ b/target/i386/cpu.c
> @@ -1391,15 +1391,6 @@ static char *x86_cpu_type_name(const char *model_name)
> return g_strdup_printf(X86_CPU_TYPE_NAME("%s"), model_name);
> }
>
> -static ObjectClass *x86_cpu_class_by_name(const char *cpu_model)
> -{
> - ObjectClass *oc;
> - char *typename = x86_cpu_type_name(cpu_model);
> - oc = object_class_by_name(typename);
> - g_free(typename);
> - return oc;
> -}
> -
> static char *x86_cpu_class_get_model_name(X86CPUClass *cc)
> {
> const char *class_name = object_class_get_name(OBJECT_CLASS(cc));
> @@ -5851,7 +5842,7 @@ static void x86_cpu_common_class_init(ObjectClass *oc,
> void *data)
> cc->reset = x86_cpu_reset;
> cc->reset_dump_flags = CPU_DUMP_FPU | CPU_DUMP_CCOP;
>
> - cc->class_by_name = x86_cpu_class_by_name;
> + cc->class_name_format = X86_CPU_TYPE_NAME("%s");
> cc->parse_features = x86_cpu_parse_featurestr;
> cc->has_work = x86_cpu_has_work;
> #ifdef CONFIG_TCG
> diff --git a/target/lm32/cpu.c b/target/lm32/cpu.c
> index b7499cb627..675bea10e8 100644
> --- a/target/lm32/cpu.c
> +++ b/target/lm32/cpu.c
> @@ -201,21 +201,6 @@ static void lm32_full_cpu_initfn(Object *obj)
> | LM32_FEATURE_CYCLE_COUNT;
> }
>
> -static ObjectClass *lm32_cpu_class_by_name(const char *cpu_model)
> -{
> - ObjectClass *oc;
> - char *typename;
> -
> - typename = g_strdup_printf(LM32_CPU_TYPE_NAME("%s"), cpu_model);
> - oc = object_class_by_name(typename);
> - g_free(typename);
> - if (oc != NULL && (!object_class_dynamic_cast(oc, TYPE_LM32_CPU) ||
> - object_class_is_abstract(oc))) {
> - oc = NULL;
> - }
> - return oc;
> -}
> -
> static void lm32_cpu_class_init(ObjectClass *oc, void *data)
> {
> LM32CPUClass *lcc = LM32_CPU_CLASS(oc);
> @@ -227,7 +212,7 @@ static void lm32_cpu_class_init(ObjectClass *oc, void
> *data)
> lcc->parent_reset = cc->reset;
> cc->reset = lm32_cpu_reset;
>
> - cc->class_by_name = lm32_cpu_class_by_name;
> + cc->class_name_format = LM32_CPU_TYPE_NAME("%s");
> cc->has_work = lm32_cpu_has_work;
> cc->do_interrupt = lm32_cpu_do_interrupt;
> cc->cpu_exec_interrupt = lm32_cpu_exec_interrupt;
> diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c
> index 582e3a73b3..b582c8d980 100644
> --- a/target/m68k/cpu.c
> +++ b/target/m68k/cpu.c
> @@ -81,21 +81,6 @@ static void m68k_cpu_disas_set_info(CPUState *s,
> disassemble_info *info)
>
> /* CPU models */
>
> -static ObjectClass *m68k_cpu_class_by_name(const char *cpu_model)
> -{
> - ObjectClass *oc;
> - char *typename;
> -
> - 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))) {
> - return NULL;
> - }
> - return oc;
> -}
> -
> static void m5206_cpu_initfn(Object *obj)
> {
> M68kCPU *cpu = M68K_CPU(obj);
> @@ -261,7 +246,7 @@ static void m68k_cpu_class_init(ObjectClass *c, void
> *data)
> mcc->parent_reset = cc->reset;
> cc->reset = m68k_cpu_reset;
>
> - cc->class_by_name = m68k_cpu_class_by_name;
> + cc->class_name_format = M68K_CPU_TYPE_NAME("%s");
> cc->has_work = m68k_cpu_has_work;
> cc->do_interrupt = m68k_cpu_do_interrupt;
> cc->cpu_exec_interrupt = m68k_cpu_exec_interrupt;
> diff --git a/target/mips/cpu.c b/target/mips/cpu.c
> index e217fb3e36..c3b30f5562 100644
> --- a/target/mips/cpu.c
> +++ b/target/mips/cpu.c
> @@ -166,17 +166,6 @@ static char *mips_cpu_type_name(const char *cpu_model)
> return g_strdup_printf(MIPS_CPU_TYPE_NAME("%s"), cpu_model);
> }
>
> -static ObjectClass *mips_cpu_class_by_name(const char *cpu_model)
> -{
> - ObjectClass *oc;
> - char *typename;
> -
> - typename = mips_cpu_type_name(cpu_model);
> - oc = object_class_by_name(typename);
> - g_free(typename);
> - return oc;
> -}
> -
> static void mips_cpu_class_init(ObjectClass *c, void *data)
> {
> MIPSCPUClass *mcc = MIPS_CPU_CLASS(c);
> @@ -188,7 +177,7 @@ static void mips_cpu_class_init(ObjectClass *c, void
> *data)
> mcc->parent_reset = cc->reset;
> cc->reset = mips_cpu_reset;
>
> - cc->class_by_name = mips_cpu_class_by_name;
> + cc->class_name_format = MIPS_CPU_TYPE_NAME("%s");
> cc->has_work = mips_cpu_has_work;
> cc->do_interrupt = mips_cpu_do_interrupt;
> cc->cpu_exec_interrupt = mips_cpu_exec_interrupt;
> diff --git a/target/moxie/cpu.c b/target/moxie/cpu.c
> index 46434e65ba..8e7768e576 100644
> --- a/target/moxie/cpu.c
> +++ b/target/moxie/cpu.c
> @@ -80,21 +80,6 @@ static void moxie_cpu_initfn(Object *obj)
> cs->env_ptr = &cpu->env;
> }
>
> -static ObjectClass *moxie_cpu_class_by_name(const char *cpu_model)
> -{
> - ObjectClass *oc;
> - char *typename;
> -
> - typename = g_strdup_printf(MOXIE_CPU_TYPE_NAME("%s"), cpu_model);
> - oc = object_class_by_name(typename);
> - g_free(typename);
> - if (oc != NULL && (!object_class_dynamic_cast(oc, TYPE_MOXIE_CPU) ||
> - object_class_is_abstract(oc))) {
> - return NULL;
> - }
> - return oc;
> -}
> -
> static void moxie_cpu_class_init(ObjectClass *oc, void *data)
> {
> DeviceClass *dc = DEVICE_CLASS(oc);
> @@ -106,7 +91,7 @@ static void moxie_cpu_class_init(ObjectClass *oc, void
> *data)
> mcc->parent_reset = cc->reset;
> cc->reset = moxie_cpu_reset;
>
> - cc->class_by_name = moxie_cpu_class_by_name;
> + cc->class_name_format = MOXIE_CPU_TYPE_NAME("%s");
>
> cc->has_work = moxie_cpu_has_work;
> cc->do_interrupt = moxie_cpu_do_interrupt;
> diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c
> index 541b2a66c7..f78b5a2cd8 100644
> --- a/target/openrisc/cpu.c
> +++ b/target/openrisc/cpu.c
> @@ -99,21 +99,6 @@ static void openrisc_cpu_initfn(Object *obj)
>
> /* CPU models */
>
> -static ObjectClass *openrisc_cpu_class_by_name(const char *cpu_model)
> -{
> - ObjectClass *oc;
> - char *typename;
> -
> - 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))) {
> - return NULL;
> - }
> - return oc;
> -}
> -
> static void or1200_initfn(Object *obj)
> {
> OpenRISCCPU *cpu = OPENRISC_CPU(obj);
> @@ -140,7 +125,7 @@ static void openrisc_cpu_class_init(ObjectClass *oc, void
> *data)
> occ->parent_reset = cc->reset;
> cc->reset = openrisc_cpu_reset;
>
> - cc->class_by_name = openrisc_cpu_class_by_name;
> + cc->class_name_format = OPENRISC_CPU_TYPE_NAME("%s");
> cc->has_work = openrisc_cpu_has_work;
> cc->do_interrupt = openrisc_cpu_do_interrupt;
> cc->cpu_exec_interrupt = openrisc_cpu_exec_interrupt;
> diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
> index 5e97a83c80..7bd32966bc 100644
> --- a/target/riscv/cpu.c
> +++ b/target/riscv/cpu.c
> @@ -175,21 +175,6 @@ static void rv64imacu_nommu_cpu_init(Object *obj)
>
> #endif
>
> -static ObjectClass *riscv_cpu_class_by_name(const char *cpu_model)
> -{
> - ObjectClass *oc;
> - char *typename;
> -
> - typename = g_strdup_printf(RISCV_CPU_TYPE_NAME("%s"), cpu_model);
> - oc = object_class_by_name(typename);
> - g_free(typename);
> - if (!oc || !object_class_dynamic_cast(oc, TYPE_RISCV_CPU) ||
> - object_class_is_abstract(oc)) {
> - return NULL;
> - }
> - return oc;
> -}
> -
> static void riscv_cpu_dump_state(CPUState *cs, FILE *f,
> fprintf_function cpu_fprintf, int flags)
> {
> @@ -335,7 +320,7 @@ static void riscv_cpu_class_init(ObjectClass *c, void
> *data)
> mcc->parent_reset = cc->reset;
> cc->reset = riscv_cpu_reset;
>
> - cc->class_by_name = riscv_cpu_class_by_name;
> + cc->class_name_format = RISCV_CPU_TYPE_NAME("%s");
> cc->has_work = riscv_cpu_has_work;
> cc->do_interrupt = riscv_cpu_do_interrupt;
> cc->cpu_exec_interrupt = riscv_cpu_exec_interrupt;
> diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
> index 698dd9cb82..4ecd3f60be 100644
> --- a/target/s390x/cpu.c
> +++ b/target/s390x/cpu.c
> @@ -461,7 +461,7 @@ static void s390_cpu_class_init(ObjectClass *oc, void
> *data)
> scc->cpu_reset = s390_cpu_reset;
> scc->initial_cpu_reset = s390_cpu_initial_reset;
> cc->reset = s390_cpu_full_reset;
> - cc->class_by_name = s390_cpu_class_by_name,
> + cc->class_name_format = S390_CPU_TYPE_NAME("%s");
> cc->has_work = s390_cpu_has_work;
> #ifdef CONFIG_TCG
> cc->do_interrupt = s390_cpu_do_interrupt;
> diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
> index 391698595f..fa248c5b3f 100644
> --- a/target/s390x/cpu_models.c
> +++ b/target/s390x/cpu_models.c
> @@ -1278,16 +1278,6 @@ static char *s390_base_cpu_type_name(const char
> *model_name)
> return g_strdup_printf(S390_CPU_TYPE_NAME("%s-base"), model_name);
> }
>
> -ObjectClass *s390_cpu_class_by_name(const char *name)
> -{
> - char *typename = s390_cpu_type_name(name);
> - ObjectClass *oc;
> -
> - oc = object_class_by_name(typename);
> - g_free(typename);
> - return oc;
> -}
> -
> static const TypeInfo qemu_s390_cpu_type_info = {
> .name = S390_CPU_TYPE_NAME("qemu"),
> .parent = TYPE_S390_CPU,
> diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c
> index e8d37e4040..81460f6aed 100644
> --- a/target/tricore/cpu.c
> +++ b/target/tricore/cpu.c
> @@ -111,21 +111,6 @@ static void tricore_cpu_initfn(Object *obj)
> cs->env_ptr = env;
> }
>
> -static ObjectClass *tricore_cpu_class_by_name(const char *cpu_model)
> -{
> - ObjectClass *oc;
> - char *typename;
> -
> - 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)) {
> - return NULL;
> - }
> - return oc;
> -}
> -
> static void tc1796_initfn(Object *obj)
> {
> TriCoreCPU *cpu = TRICORE_CPU(obj);
> @@ -158,7 +143,7 @@ static void tricore_cpu_class_init(ObjectClass *c, void
> *data)
>
> mcc->parent_reset = cc->reset;
> cc->reset = tricore_cpu_reset;
> - cc->class_by_name = tricore_cpu_class_by_name;
> + cc->class_name_format = TRICORE_CPU_TYPE_NAME("%s");
> cc->has_work = tricore_cpu_has_work;
>
> cc->dump_state = tricore_cpu_dump_state;
> diff --git a/target/unicore32/cpu.c b/target/unicore32/cpu.c
> index 2b49d1ca40..f7b3dd2bb1 100644
> --- a/target/unicore32/cpu.c
> +++ b/target/unicore32/cpu.c
> @@ -40,21 +40,6 @@ static inline void set_feature(CPUUniCore32State *env, int
> feature)
>
> /* CPU models */
>
> -static ObjectClass *uc32_cpu_class_by_name(const char *cpu_model)
> -{
> - ObjectClass *oc;
> - char *typename;
> -
> - typename = g_strdup_printf(UNICORE32_CPU_TYPE_NAME("%s"), cpu_model);
> - oc = object_class_by_name(typename);
> - g_free(typename);
> - if (oc != NULL && (!object_class_dynamic_cast(oc, TYPE_UNICORE32_CPU) ||
> - object_class_is_abstract(oc))) {
> - oc = NULL;
> - }
> - return oc;
> -}
> -
> static void unicore_ii_cpu_initfn(Object *obj)
> {
> UniCore32CPU *cpu = UNICORE32_CPU(obj);
> @@ -132,7 +117,7 @@ static void uc32_cpu_class_init(ObjectClass *oc, void
> *data)
> device_class_set_parent_realize(dc, uc32_cpu_realizefn,
> &ucc->parent_realize);
>
> - cc->class_by_name = uc32_cpu_class_by_name;
> + cc->class_name_format = UNICORE32_CPU_TYPE_NAME("%s");
> cc->has_work = uc32_cpu_has_work;
> cc->do_interrupt = uc32_cpu_do_interrupt;
> cc->cpu_exec_interrupt = uc32_cpu_exec_interrupt;
> diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c
> index a54dbe4260..2278a46989 100644
> --- a/target/xtensa/cpu.c
> +++ b/target/xtensa/cpu.c
> @@ -90,21 +90,6 @@ static void xtensa_cpu_reset(CPUState *s)
> #endif
> }
>
> -static ObjectClass *xtensa_cpu_class_by_name(const char *cpu_model)
> -{
> - ObjectClass *oc;
> - char *typename;
> -
> - 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;
> - }
> - return oc;
> -}
> -
> static void xtensa_cpu_disas_set_info(CPUState *cs, disassemble_info *info)
> {
> XtensaCPU *cpu = XTENSA_CPU(cs);
> @@ -172,7 +157,7 @@ static void xtensa_cpu_class_init(ObjectClass *oc, void
> *data)
> xcc->parent_reset = cc->reset;
> cc->reset = xtensa_cpu_reset;
>
> - cc->class_by_name = xtensa_cpu_class_by_name;
> + cc->class_name_format = XTENSA_CPU_TYPE_NAME("%s");
> cc->has_work = xtensa_cpu_has_work;
> cc->do_interrupt = xtensa_cpu_do_interrupt;
> cc->cpu_exec_interrupt = xtensa_cpu_exec_interrupt;
> --
> 2.18.0.rc1.1.g3f1ff2140
>
>