ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target-arm: Rename CPU types 

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.
This leads to names like arm926-arm-cpu but is easiest to handle.

No functional changes for -cpu arguments or -cpu ? output.

Suggested-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Andreas Färber 2013-01-27 17:30:10 +01:00 committed by Peter Maydell
parent e4c1cfa5cb
commit 51492fd1a9
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-arm/cpu.c
View File

@ -204,12 +204,15 @@ void arm_cpu_realize(ARMCPU *cpu)
static ObjectClass *arm_cpu_class_by_name(const char *cpu_model) static ObjectClass *arm_cpu_class_by_name(const char *cpu_model)
{ {
ObjectClass *oc; ObjectClass *oc;
char *typename;
if (!cpu_model) { if (!cpu_model) {
return NULL; 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) || if (!oc || !object_class_dynamic_cast(oc, TYPE_ARM_CPU) ||
object_class_is_abstract(oc)) { object_class_is_abstract(oc)) {
return NULL; return NULL;
@ -789,14 +792,15 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data)
static void cpu_register(const ARMCPUInfo *info) static void cpu_register(const ARMCPUInfo *info)
{ {
TypeInfo type_info = { TypeInfo type_info = {
.name = info->name,
.parent = TYPE_ARM_CPU, .parent = TYPE_ARM_CPU,
.instance_size = sizeof(ARMCPU), .instance_size = sizeof(ARMCPU),
.instance_init = info->initfn, .instance_init = info->initfn,
.class_size = sizeof(ARMCPUClass), .class_size = sizeof(ARMCPUClass),
}; };
type_info.name = g_strdup_printf("%s-" TYPE_ARM_CPU, info->name);
type_register(&type_info); type_register(&type_info);
g_free((void *)type_info.name);
} }
static const TypeInfo arm_cpu_type_info = { static const TypeInfo arm_cpu_type_info = {

11
target-arm/helper.c
View File

@ -1303,9 +1303,9 @@ static gint arm_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_ARM_CPU) == 0) {
return 1; return 1;
} else if (strcmp(name_b, "any") == 0) { } else if (strcmp(name_b, "any-" TYPE_ARM_CPU) == 0) {
return -1; return -1;
} else { } else {
return strcmp(name_a, name_b); return strcmp(name_a, name_b);
@ -1316,9 +1316,14 @@ static void arm_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_ARM_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 arm_cpu_list(FILE *f, fprintf_function cpu_fprintf) void arm_cpu_list(FILE *f, fprintf_function cpu_fprintf)