[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/12] target-m68k: Rename CPU subtypes
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 07/12] target-m68k: Rename CPU subtypes |
Date: |
Fri, 1 Feb 2013 01:44:35 +0100 |
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 <address@hidden>
---
target-m68k/cpu.c | 8 ++++++--
target-m68k/helper.c | 11 ++++++++---
2 Dateien geändert, 14 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-)
diff --git a/target-m68k/cpu.c b/target-m68k/cpu.c
index c911b8f..c71f715 100644
--- a/target-m68k/cpu.c
+++ b/target-m68k/cpu.c
@@ -59,12 +59,15 @@ static void m68k_cpu_reset(CPUState *s)
static ObjectClass *m68k_cpu_class_by_name(const char *cpu_model)
{
ObjectClass *oc;
+ char *typename;
if (cpu_model == 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 ||
object_class_is_abstract(oc))) {
return NULL;
@@ -165,12 +168,13 @@ static void m68k_cpu_class_init(ObjectClass *c, void
*data)
static void register_cpu_type(const M68kCPUInfo *info)
{
TypeInfo type_info = {
- .name = info->name,
.parent = TYPE_M68K_CPU,
.instance_init = info->instance_init,
};
+ type_info.name = g_strdup_printf("%s-" TYPE_M68K_CPU, info->name);
type_register(&type_info);
+ g_free((void *)type_info.name);
}
static const TypeInfo m68k_cpu_type_info = {
diff --git a/target-m68k/helper.c b/target-m68k/helper.c
index f66e12b..5ddcd70 100644
--- a/target-m68k/helper.c
+++ b/target-m68k/helper.c
@@ -34,9 +34,9 @@ static gint m68k_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_M68K_CPU) == 0) {
return 1;
- } else if (strcmp(name_b, "any") == 0) {
+ } else if (strcmp(name_b, "any-" TYPE_M68K_CPU) == 0) {
return -1;
} else {
return strcasecmp(name_a, name_b);
@@ -47,9 +47,14 @@ static void m68k_cpu_list_entry(gpointer data, gpointer
user_data)
{
ObjectClass *c = 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",
- object_class_get_name(c));
+ name);
+ g_free(name);
}
void m68k_cpu_list(FILE *f, fprintf_function cpu_fprintf)
--
1.7.10.4
- [Qemu-devel] [PULL 00/12] QOM CPUState patch queue 2013-02-01, Andreas Färber, 2013/01/31
- [Qemu-devel] [PATCH 02/12] target-microblaze: Mark as unmigratable, Andreas Färber, 2013/01/31
- [Qemu-devel] [PATCH 04/12] target-sh4: Mark as unmigratable, Andreas Färber, 2013/01/31
- [Qemu-devel] [PATCH 01/12] target-unicore32: Mark as unmigratable, Andreas Färber, 2013/01/31
- [Qemu-devel] [PATCH 07/12] target-m68k: Rename CPU subtypes,
Andreas Färber <=
- [Qemu-devel] [PATCH 06/12] target-m68k: Mark as unmigratable, Andreas Färber, 2013/01/31
- [Qemu-devel] [PATCH 05/12] target-s390x: Mark as unmigratable, Andreas Färber, 2013/01/31
- [Qemu-devel] [PATCH 11/12] target-i386: Pass X86CPU to cpu_x86_set_a20(), Andreas Färber, 2013/01/31
- [Qemu-devel] [PATCH 08/12] target-openrisc: TYPE_OPENRISC_CPU should be abstract, Andreas Färber, 2013/01/31
- [Qemu-devel] [PATCH 10/12] target-unicore32: Rename CPU subtypes, Andreas Färber, 2013/01/31
- [Qemu-devel] [PATCH 03/12] target-xtensa: Mark as unmigratable, Andreas Färber, 2013/01/31
- [Qemu-devel] [PATCH 09/12] target-openrisc: Rename CPU subtypes, Andreas Färber, 2013/01/31
- [Qemu-devel] [PATCH 12/12] linux-user: bsd-user: Don't reset X86CPU twice, Andreas Färber, 2013/01/31