diff options
| -rw-r--r-- | hw/moxie/moxiesim.c | 2 | ||||
| -rw-r--r-- | target/moxie/cpu.c | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c index 5ea8dd3a93..01b9f34f87 100644 --- a/hw/moxie/moxiesim.c +++ b/hw/moxie/moxiesim.c @@ -116,7 +116,7 @@ static void moxiesim_init(MachineState *machine) /* Init CPUs. */ if (cpu_model == NULL) { - cpu_model = "MoxieLite-moxie-cpu"; + cpu_model = "MoxieLite"; } cpu = MOXIE_CPU(cpu_generic_init(TYPE_MOXIE_CPU, cpu_model)); env = &cpu->env; diff --git a/target/moxie/cpu.c b/target/moxie/cpu.c index 24ab3f3708..44441b2cf2 100644 --- a/target/moxie/cpu.c +++ b/target/moxie/cpu.c @@ -83,7 +83,12 @@ static void moxie_cpu_initfn(Object *obj) static ObjectClass *moxie_cpu_class_by_name(const char *cpu_model) { - ObjectClass *oc = object_class_by_name(cpu_model); + ObjectClass *oc; + char *typename; + + typename = g_strdup_printf("%s-" TYPE_MOXIE_CPU, 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; |