target/s390x: display deprecation status in '-cpu help'
When the user queries CPU models via QMP there is a 'deprecated' flag present, however, this is not done for the CLI '-cpu help' command. Reviewed-by: Cornelia Huck <cohuck@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
parent
5dfa9e8689
commit
738cdc2f6e
|
@ -334,18 +334,31 @@ const S390CPUDef *s390_find_cpu_def(uint16_t type, uint8_t gen, uint8_t ec_ga,
|
||||||
static void s390_print_cpu_model_list_entry(gpointer data, gpointer user_data)
|
static void s390_print_cpu_model_list_entry(gpointer data, gpointer user_data)
|
||||||
{
|
{
|
||||||
const S390CPUClass *scc = S390_CPU_CLASS((ObjectClass *)data);
|
const S390CPUClass *scc = S390_CPU_CLASS((ObjectClass *)data);
|
||||||
|
CPUClass *cc = CPU_CLASS(scc);
|
||||||
char *name = g_strdup(object_class_get_name((ObjectClass *)data));
|
char *name = g_strdup(object_class_get_name((ObjectClass *)data));
|
||||||
const char *details = "";
|
g_autoptr(GString) details = g_string_new("");
|
||||||
|
|
||||||
if (scc->is_static) {
|
if (scc->is_static) {
|
||||||
details = "(static, migration-safe)";
|
g_string_append(details, "static, ");
|
||||||
} else if (scc->is_migration_safe) {
|
}
|
||||||
details = "(migration-safe)";
|
if (scc->is_migration_safe) {
|
||||||
|
g_string_append(details, "migration-safe, ");
|
||||||
|
}
|
||||||
|
if (cc->deprecation_note) {
|
||||||
|
g_string_append(details, "deprecated, ");
|
||||||
|
}
|
||||||
|
if (details->len) {
|
||||||
|
/* cull trailing ', ' */
|
||||||
|
g_string_truncate(details, details->len - 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* strip off the -s390x-cpu */
|
/* strip off the -s390x-cpu */
|
||||||
g_strrstr(name, "-" TYPE_S390_CPU)[0] = 0;
|
g_strrstr(name, "-" TYPE_S390_CPU)[0] = 0;
|
||||||
qemu_printf("s390 %-15s %-35s %s\n", name, scc->desc, details);
|
if (details->len) {
|
||||||
|
qemu_printf("s390 %-15s %-35s (%s)\n", name, scc->desc, details->str);
|
||||||
|
} else {
|
||||||
|
qemu_printf("s390 %-15s %-35s\n", name, scc->desc);
|
||||||
|
}
|
||||||
g_free(name);
|
g_free(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue