diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-01-27 22:50:35 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-02-01 01:35:43 +0100 |
| commit | 478032a93d908e59085c1ac56f10979942e7dc4f (patch) | |
| tree | d76350ea744d3f4612e5e3f50420b0edf874f7bd | |
| parent | bc755a00b1fd58ac9bfa316237134958489f0145 (diff) | |
| download | qemu-478032a93d908e59085c1ac56f10979942e7dc4f.tar.gz qemu-478032a93d908e59085c1ac56f10979942e7dc4f.tar.bz2 qemu-478032a93d908e59085c1ac56f10979942e7dc4f.zip | |
target-openrisc: Rename CPU subtypes
Model names were mapped 1:1 to type names. As a side effect this
registered a type "any", which is now a device.
To avoid "-device any" silliness and to pave the way for compiling
multiple targets into one executable, adopt a <name>-<arch>-cpu scheme.
No functional changes for -cpu arguments or -cpu ? output.
Signed-off-by: Andreas Färber <afaerber@suse.de>
| -rw-r--r-- | target-openrisc/cpu.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/target-openrisc/cpu.c b/target-openrisc/cpu.c index 14f2cbe18e..a7a8de8a37 100644 --- a/target-openrisc/cpu.c +++ b/target-openrisc/cpu.c @@ -144,14 +144,15 @@ static void openrisc_cpu_class_init(ObjectClass *oc, void *data) static void cpu_register(const OpenRISCCPUInfo *info) { TypeInfo type_info = { - .name = info->name, .parent = TYPE_OPENRISC_CPU, .instance_size = sizeof(OpenRISCCPU), .instance_init = info->initfn, .class_size = sizeof(OpenRISCCPUClass), }; + type_info.name = g_strdup_printf("%s-" TYPE_OPENRISC_CPU, info->name); type_register(&type_info); + g_free((void *)type_info.name); } static const TypeInfo openrisc_cpu_type_info = { @@ -200,9 +201,9 @@ static gint openrisc_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_OPENRISC_CPU) == 0) { return 1; - } else if (strcmp(name_b, "any") == 0) { + } else if (strcmp(name_b, "any-" TYPE_OPENRISC_CPU) == 0) { return -1; } else { return strcmp(name_a, name_b); @@ -213,9 +214,15 @@ static void openrisc_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_OPENRISC_CPU)); (*s->cpu_fprintf)(s->file, " %s\n", - object_class_get_name(oc)); + name); + g_free(name); } void cpu_openrisc_list(FILE *f, fprintf_function cpu_fprintf) |