For target/cris, the CPU type name can be: (1) the combination of the CPU model name and suffix; (2) alias "any" corresponding to "crisv32-cris-cpu". The CPU model names have been shown correctly by following (1).
Use generic helper cpu_model_from_type() to show the CPU model names in arm_cpu_list_entry(), and rename @name to @model since it's points to the CPU model name instead of the CPU type name. Signed-off-by: Gavin Shan <gs...@redhat.com> --- target/cris/cpu.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/target/cris/cpu.c b/target/cris/cpu.c index a6a93c2359..420a2f75fb 100644 --- a/target/cris/cpu.c +++ b/target/cris/cpu.c @@ -122,11 +122,10 @@ static void cris_cpu_list_entry(gpointer data, gpointer user_data) { ObjectClass *oc = data; const char *typename = object_class_get_name(oc); - char *name; + char *model = cpu_model_from_type(typename); - name = g_strndup(typename, strlen(typename) - strlen(CRIS_CPU_TYPE_SUFFIX)); - qemu_printf(" %s\n", name); - g_free(name); + qemu_printf(" %s\n", model); + g_free(model); } void cris_cpu_list(void) -- 2.41.0