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

target-m68k: Rename CPU subtypes

Browse Source 
In the initial conversion of CPU models to QOM types, model names were
mapped 1:1 to type names. As a side effect this gained us 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 20:16:17 +01:00
parent 087fe4f824
commit 7a9f812b38
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target-m68k/cpu.c
View File

@ -59,12 +59,15 @@ static void m68k_cpu_reset(CPUState *s)
static ObjectClass *m68k_cpu_class_by_name(const char *cpu_model) static ObjectClass *m68k_cpu_class_by_name(const char *cpu_model)
{ {
ObjectClass *oc; ObjectClass *oc;
char *typename;
if (cpu_model == NULL) { if (cpu_model == NULL) {
return NULL; return NULL;
} }
oc = object_class_by_name(cpu_model); typename = g_strdup_printf("%s-" TYPE_M68K_CPU, cpu_model);
oc = object_class_by_name(typename);
g_free(typename);
if (oc != NULL && (object_class_dynamic_cast(oc, TYPE_M68K_CPU) == NULL || if (oc != NULL && (object_class_dynamic_cast(oc, TYPE_M68K_CPU) == NULL ||
object_class_is_abstract(oc))) { object_class_is_abstract(oc))) {
return NULL; return NULL;
@ -165,12 +168,13 @@ static void m68k_cpu_class_init(ObjectClass *c, void *data)
static void register_cpu_type(const M68kCPUInfo *info) static void register_cpu_type(const M68kCPUInfo *info)
{ {
TypeInfo type_info = { TypeInfo type_info = {
.name = info->name,
.parent = TYPE_M68K_CPU, .parent = TYPE_M68K_CPU,
.instance_init = info->instance_init, .instance_init = info->instance_init,
}; };
type_info.name = g_strdup_printf("%s-" TYPE_M68K_CPU, info->name);
type_register(&type_info); type_register(&type_info);
g_free((void *)type_info.name);
} }
static const TypeInfo m68k_cpu_type_info = { static const TypeInfo m68k_cpu_type_info = {

11
target-m68k/helper.c
View File

@ -34,9 +34,9 @@ static gint m68k_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_M68K_CPU) == 0) {
return 1; return 1;
} else if (strcmp(name_b, "any") == 0) { } else if (strcmp(name_b, "any-" TYPE_M68K_CPU) == 0) {
return -1; return -1;
} else { } else {
return strcasecmp(name_a, name_b); return strcasecmp(name_a, name_b);
@ -47,9 +47,14 @@ static void m68k_cpu_list_entry(gpointer data, gpointer user_data)
{ {
ObjectClass *c = data; ObjectClass *c = data;
CPUListState *s = user_data; CPUListState *s = user_data;
const char *typename;
char *name;
typename = object_class_get_name(c);
name = g_strndup(typename, strlen(typename) - strlen("-" TYPE_M68K_CPU));
(*s->cpu_fprintf)(s->file, "%s\n", (*s->cpu_fprintf)(s->file, "%s\n",
object_class_get_name(c)); name);
g_free(name);
} }
void m68k_cpu_list(FILE *f, fprintf_function cpu_fprintf) void m68k_cpu_list(FILE *f, fprintf_function cpu_fprintf)