diff options
author | Daniel P. Berrangé <berrange@redhat.com> | 2022-05-24 15:44:55 +0100 |
---|---|---|
committer | Daniel P. Berrangé <berrange@redhat.com> | 2022-08-05 16:18:15 +0100 |
commit | 738cdc2f6ea1ce22bb3f2a4e0fc84fc8121896fb (patch) | |
tree | 78b2bc4e5073101dda0bb13d6d52170ef9eab231 /target/s390x | |
parent | 5dfa9e8689d08c529bf772fc199597efa947fa27 (diff) | |
download | qemu-738cdc2f6ea1ce22bb3f2a4e0fc84fc8121896fb.zip qemu-738cdc2f6ea1ce22bb3f2a4e0fc84fc8121896fb.tar.gz qemu-738cdc2f6ea1ce22bb3f2a4e0fc84fc8121896fb.tar.bz2 |
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>
Diffstat (limited to 'target/s390x')
-rw-r--r-- | target/s390x/cpu_models.c | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 1a562d2..c3a4f80 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -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) { const S390CPUClass *scc = S390_CPU_CLASS((ObjectClass *)data); + CPUClass *cc = CPU_CLASS(scc); char *name = g_strdup(object_class_get_name((ObjectClass *)data)); - const char *details = ""; + g_autoptr(GString) details = g_string_new(""); if (scc->is_static) { - details = "(static, migration-safe)"; - } else if (scc->is_migration_safe) { - details = "(migration-safe)"; + g_string_append(details, "static, "); + } + 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 */ 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); } |