@@ -144,11 +144,6 @@ static void hppa_cpu_initfn(Object *obj)
cpu_hppa_put_psw(env, PSW_W);
}
-static ObjectClass *hppa_cpu_class_by_name(const char *cpu_model)
-{
- return object_class_by_name(TYPE_HPPA_CPU);
-}
-
static void hppa_cpu_class_init(ObjectClass *oc, void *data)
{
DeviceClass *dc = DEVICE_CLASS(oc);
@@ -158,7 +153,8 @@ static void hppa_cpu_class_init(ObjectClass *oc, void *data)
device_class_set_parent_realize(dc, hppa_cpu_realizefn,
&acc->parent_realize);
- cc->class_by_name = hppa_cpu_class_by_name;
+ /* All CPU model names are translated to the same QOM class */
+ cc->class_name_format = TYPE_HPPA_CPU;
cc->has_work = hppa_cpu_has_work;
cc->do_interrupt = hppa_cpu_do_interrupt;
cc->cpu_exec_interrupt = hppa_cpu_exec_interrupt;
@@ -280,11 +280,6 @@ static Property mb_properties[] = {
DEFINE_PROP_END_OF_LIST(),
};
-static ObjectClass *mb_cpu_class_by_name(const char *cpu_model)
-{
- return object_class_by_name(TYPE_MICROBLAZE_CPU);
-}
-
static void mb_cpu_class_init(ObjectClass *oc, void *data)
{
DeviceClass *dc = DEVICE_CLASS(oc);
@@ -296,7 +291,8 @@ static void mb_cpu_class_init(ObjectClass *oc, void *data)
mcc->parent_reset = cc->reset;
cc->reset = mb_cpu_reset;
- cc->class_by_name = mb_cpu_class_by_name;
+ /* All CPU model names are translated to the same QOM class */
+ cc->class_name_format = TYPE_MICROBLAZE_CPU;
cc->has_work = mb_cpu_has_work;
cc->do_interrupt = mb_cpu_do_interrupt;
cc->cpu_exec_interrupt = mb_cpu_exec_interrupt;
@@ -77,11 +77,6 @@ static void nios2_cpu_initfn(Object *obj)
#endif
}
-static ObjectClass *nios2_cpu_class_by_name(const char *cpu_model)
-{
- return object_class_by_name(TYPE_NIOS2_CPU);
-}
-
static void nios2_cpu_realizefn(DeviceState *dev, Error **errp)
{
CPUState *cs = CPU(dev);
@@ -193,7 +188,8 @@ static void nios2_cpu_class_init(ObjectClass *oc, void *data)
ncc->parent_reset = cc->reset;
cc->reset = nios2_cpu_reset;
- cc->class_by_name = nios2_cpu_class_by_name;
+ /* All CPU model names are translated to the same QOM class */
+ cc->class_name_format = TYPE_NIOS2_CPU;
cc->has_work = nios2_cpu_has_work;
cc->do_interrupt = nios2_cpu_do_interrupt;
cc->cpu_exec_interrupt = nios2_cpu_exec_interrupt;
@@ -51,11 +51,6 @@ static void tilegx_cpu_dump_state(CPUState *cs, FILE *f,
env->pc, env->spregs[TILEGX_SPR_CMPEXCH]);
}
-static ObjectClass *tilegx_cpu_class_by_name(const char *cpu_model)
-{
- return object_class_by_name(TYPE_TILEGX_CPU);
-}
-
static void tilegx_cpu_set_pc(CPUState *cs, vaddr value)
{
TileGXCPU *cpu = TILEGX_CPU(cs);
@@ -146,7 +141,8 @@ static void tilegx_cpu_class_init(ObjectClass *oc, void *data)
tcc->parent_reset = cc->reset;
cc->reset = tilegx_cpu_reset;
- cc->class_by_name = tilegx_cpu_class_by_name;
+ /* All CPU model names are translated to the same QOM class */
+ cc->class_name_format = TYPE_TILEGX_CPU;
cc->has_work = tilegx_cpu_has_work;
cc->do_interrupt = tilegx_cpu_do_interrupt;
cc->cpu_exec_interrupt = tilegx_cpu_exec_interrupt;
hppa, microblaze, nios2, and tilegx have a fixed class name being returned by CPUClass::class_by_name. We can implement the same behavior by setting CPUClass::class_name_format. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- Cc: Richard Henderson <rth@twiddle.net> Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com> Cc: Chris Wulff <crwulff@gmail.com> Cc: Marek Vasut <marex@denx.de> --- target/hppa/cpu.c | 8 ++------ target/microblaze/cpu.c | 8 ++------ target/nios2/cpu.c | 8 ++------ target/tilegx/cpu.c | 8 ++------ 4 files changed, 8 insertions(+), 24 deletions(-)