diff options
Diffstat (limited to 'target-arm/cpu.c')
| -rw-r--r-- | target-arm/cpu.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/target-arm/cpu.c b/target-arm/cpu.c index d1a4c82680..1c6a628df4 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -204,12 +204,15 @@ void arm_cpu_realize(ARMCPU *cpu) static ObjectClass *arm_cpu_class_by_name(const char *cpu_model) { ObjectClass *oc; + char *typename; if (!cpu_model) { return NULL; } - oc = object_class_by_name(cpu_model); + typename = g_strdup_printf("%s-" TYPE_ARM_CPU, 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; @@ -789,14 +792,15 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data) static void cpu_register(const ARMCPUInfo *info) { TypeInfo type_info = { - .name = info->name, .parent = TYPE_ARM_CPU, .instance_size = sizeof(ARMCPU), .instance_init = info->initfn, .class_size = sizeof(ARMCPUClass), }; + type_info.name = g_strdup_printf("%s-" TYPE_ARM_CPU, info->name); type_register(&type_info); + g_free((void *)type_info.name); } static const TypeInfo arm_cpu_type_info = { |