Everything is converted to use the AliasedClass 'aliases' field
now.
Signed-off-by: Daniel P. Berrangé <[email protected]>
---
hw/core/machine-qmp-cmds.c | 16 ++++------------
include/hw/core/boards.h | 1 -
system/vl.c | 4 +---
3 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c
index 787c69e176f..ade5a31c239 100644
--- a/hw/core/machine-qmp-cmds.c
+++ b/hw/core/machine-qmp-cmds.c
@@ -175,6 +175,7 @@ MachineInfoList *qmp_query_machines(bool has_compat_props,
bool compat_props,
if (alc->aliases) {
strList **aliases = &info->aliases;
size_t i;
+ int len;
info->has_aliases = true;
for (i = 0; alc->aliases[i] != NULL; i++) {
/*
@@ -182,21 +183,12 @@ MachineInfoList *qmp_query_machines(bool
has_compat_props, bool compat_props,
* we report machine types to the user, hence must
* strip the typename suffix
*/
- int len = strlen(alc->aliases[i]) -
strlen(TYPE_MACHINE_SUFFIX);
+ len = strlen(alc->aliases[i]) - strlen(TYPE_MACHINE_SUFFIX);
QAPI_LIST_APPEND(aliases,
g_strndup(alc->aliases[i], len));
}
- if (!mc->alias) {
- int len = strlen(alc->aliases[0]) -
strlen(TYPE_MACHINE_SUFFIX);
- info->alias = g_strndup(alc->aliases[0], len);
- }
- }
- if (mc->alias) {
- info->alias = g_strdup(mc->alias);
- if (!info->aliases) {
- strList **aliases = &info->aliases;
- QAPI_LIST_APPEND(aliases, g_strdup(mc->alias));
- }
+ len = strlen(alc->aliases[0]) - strlen(TYPE_MACHINE_SUFFIX);
+ info->alias = g_strndup(alc->aliases[0], len);
}
info->name = g_strdup(mc->name);
diff --git a/include/hw/core/boards.h b/include/hw/core/boards.h
index ea1e26a8c52..0a5517a2a13 100644
--- a/include/hw/core/boards.h
+++ b/include/hw/core/boards.h
@@ -270,7 +270,6 @@ struct MachineClass {
const char *family; /* NULL iff @name identifies a standalone machtype */
char *name;
- const char *alias;
const char *desc;
const char *deprecation_reason;
diff --git a/system/vl.c b/system/vl.c
index f4e17173f96..fb5d55f3d68 100644
--- a/system/vl.c
+++ b/system/vl.c
@@ -852,7 +852,7 @@ static ObjectClass *find_machine(const char *name, GSList
*machines,
for (el = machines; el; el = el->next) {
MachineClass *mc = el->data;
- if (!strcmp(mc->name, name) || !g_strcmp0(mc->alias, name)) {
+ if (!strcmp(mc->name, name)) {
return OBJECT_CLASS(mc);
}
}
@@ -1598,8 +1598,6 @@ static void machine_help_func(const QDict *qdict)
strlen(TYPE_MACHINE_SUFFIX)),
alc->aliases[i], mc->desc, mc->name);
}
- } else if (mc->alias) {
- printf("%-25s %s (alias of %s)\n", mc->alias, mc->desc, mc->name);
}
printf("%-25s %s%s%s%s\n", mc->name, mc->desc,
mc->is_default ? " (default)" : "",
--
2.56.1