mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-12-11 16:00:50 -07:00
target-m68k: Rename CPU subtypes
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:
parent
087fe4f824
commit
7a9f812b38
2 changed files with 14 additions and 5 deletions
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue