diff options
| -rw-r--r-- | target-arm/cpu.c | 8 | ||||
| -rw-r--r-- | target-arm/helper.c | 11 |
2 files changed, 14 insertions, 5 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 = { diff --git a/target-arm/helper.c b/target-arm/helper.c index 7a10fddf25..eb7b2910c3 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -1303,9 +1303,9 @@ static gint arm_cpu_list_compare(gconstpointer a, gconstpointer b) name_a = object_class_get_name(class_a); name_b = object_class_get_name(class_b); - if (strcmp(name_a, "any") == 0) { + if (strcmp(name_a, "any-" TYPE_ARM_CPU) == 0) { return 1; - } else if (strcmp(name_b, "any") == 0) { + } else if (strcmp(name_b, "any-" TYPE_ARM_CPU) == 0) { return -1; } else { return strcmp(name_a, name_b); @@ -1316,9 +1316,14 @@ static void arm_cpu_list_entry(gpointer data, gpointer user_data) { ObjectClass *oc = data; CPUListState *s = user_data; + const char *typename; + char *name; + typename = object_class_get_name(oc); + name = g_strndup(typename, strlen(typename) - strlen("-" TYPE_ARM_CPU)); (*s->cpu_fprintf)(s->file, " %s\n", - object_class_get_name(oc)); + name); + g_free(name); } void arm_cpu_list(FILE *f, fprintf_function cpu_fprintf) |