proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-08 07:04:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

target-openrisc: Rename CPU subtypes

Browse Source 
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>
This commit is contained in:
Andreas Färber 2013-01-27 22:50:35 +01:00
parent bc755a00b1
commit 478032a93d
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
target-openrisc/cpu.c
View File

@ -144,14 +144,15 @@ static void openrisc_cpu_class_init(ObjectClass *oc, void *data)
static void cpu_register(const OpenRISCCPUInfo *info) static void cpu_register(const OpenRISCCPUInfo *info)
{ {
TypeInfo type_info = { TypeInfo type_info = {
.name = info->name,
.parent = TYPE_OPENRISC_CPU, .parent = TYPE_OPENRISC_CPU,
.instance_size = sizeof(OpenRISCCPU), .instance_size = sizeof(OpenRISCCPU),
.instance_init = info->initfn, .instance_init = info->initfn,
.class_size = sizeof(OpenRISCCPUClass), .class_size = sizeof(OpenRISCCPUClass),
}; };
type_info.name = g_strdup_printf("%s-" TYPE_OPENRISC_CPU, info->name);
type_register(&type_info); type_register(&type_info);
g_free((void *)type_info.name);
} }
static const TypeInfo openrisc_cpu_type_info = { 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_a = object_class_get_name(class_a);
name_b = object_class_get_name(class_b); 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; return 1;
} else if (strcmp(name_b, "any") == 0) { } else if (strcmp(name_b, "any-" TYPE_OPENRISC_CPU) == 0) {
return -1; return -1;
} else { } else {
return strcmp(name_a, name_b); return strcmp(name_a, name_b);
@ -213,9 +214,15 @@ static void openrisc_cpu_list_entry(gpointer data, gpointer user_data)
{ {
ObjectClass *oc = data; ObjectClass *oc = data;
CPUListState *s = user_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", (*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) void cpu_openrisc_list(FILE *f, fprintf_function cpu_fprintf)