The deprecation notes are currently only displayed at runtime when the user activates a CPU. The QMP query displays a simple flag for deprecation, while '-cpu help' displays nothing unless the deprecation info is duplicated into the 'notes' field.
This changes the code so that deprecation notes are explicitly shown in '-cpu help', to assist the user in deciding what to use. Signed-off-by: Daniel P. Berrangé <berra...@redhat.com> --- target/arm/helper.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index cfcad97ce0..1a0988d8fc 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -8222,12 +8222,20 @@ static gint arm_cpu_list_compare(gconstpointer a, gconstpointer b) static void arm_cpu_list_entry(gpointer data, gpointer user_data) { ObjectClass *oc = data; + CPUClass *cc = CPU_CLASS(oc); const char *typename; char *name; + g_autofree char *details = NULL; + + if (cc->deprecation_note) { + details = g_strdup_printf(" (deprecated: %s)", cc->deprecation_note); + } else { + details = g_strdup(""); + } typename = object_class_get_name(oc); name = g_strndup(typename, strlen(typename) - strlen("-" TYPE_ARM_CPU)); - qemu_printf(" %s\n", name); + qemu_printf(" %s%s\n", name, details); g_free(name); } -- 2.36.1