[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 03/32] target/arm: Use generic helper to show CPU model names
From: |
Gavin Shan |
Subject: |
[PATCH v3 03/32] target/arm: Use generic helper to show CPU model names |
Date: |
Thu, 7 Sep 2023 10:35:24 +1000 |
For target/arm, the CPU type name can be: (1) the combination of
the CPU model name and suffix; (2) alias "any" corresponding to
"max-arm-cpu" when CONFIG_USER_ONLY is enabled. The CPU model names
have been already shown in cpu_list() and query_cpu_definitions()
by following (1).
Use generic helper cpu_model_from_type() to show the CPU model names.
The variable @name is renamed to @model in arm_cpu_list_entry() since
it points to the CPU model name instead of the CPU type name.
Signed-off-by: Gavin Shan <gshan@redhat.com>
---
target/arm/arm-qmp-cmds.c | 6 ++----
target/arm/helper.c | 12 +++++-------
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/target/arm/arm-qmp-cmds.c b/target/arm/arm-qmp-cmds.c
index c8fa524002..51fddaefc3 100644
--- a/target/arm/arm-qmp-cmds.c
+++ b/target/arm/arm-qmp-cmds.c
@@ -233,12 +233,10 @@ static void arm_cpu_add_definition(gpointer data,
gpointer user_data)
ObjectClass *oc = data;
CpuDefinitionInfoList **cpu_list = user_data;
CpuDefinitionInfo *info;
- const char *typename;
+ const char *typename = object_class_get_name(oc);
- typename = object_class_get_name(oc);
info = g_malloc0(sizeof(*info));
- info->name = g_strndup(typename,
- strlen(typename) - strlen("-" TYPE_ARM_CPU));
+ info->name = cpu_model_from_type(typename);
info->q_typename = g_strdup(typename);
QAPI_LIST_PREPEND(*cpu_list, info);
diff --git a/target/arm/helper.c b/target/arm/helper.c
index e3f5a7d2bd..7b8257b496 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -9409,17 +9409,15 @@ static void arm_cpu_list_entry(gpointer data, gpointer
user_data)
{
ObjectClass *oc = data;
CPUClass *cc = CPU_CLASS(oc);
- const char *typename;
- char *name;
+ const char *typename = object_class_get_name(oc);
+ char *model = cpu_model_from_type(typename);
- typename = object_class_get_name(oc);
- name = g_strndup(typename, strlen(typename) - strlen("-" TYPE_ARM_CPU));
if (cc->deprecation_note) {
- qemu_printf(" %s (deprecated)\n", name);
+ qemu_printf(" %s (deprecated)\n", model);
} else {
- qemu_printf(" %s\n", name);
+ qemu_printf(" %s\n", model);
}
- g_free(name);
+ g_free(model);
}
void arm_cpu_list(void)
--
2.41.0
- [PATCH v3 00/32] Unified CPU type check, Gavin Shan, 2023/09/06
- [PATCH v3 01/32] cpu: Add helper cpu_model_from_type(), Gavin Shan, 2023/09/06
- [PATCH v3 02/32] target/alpha: Use generic helper to show CPU model names, Gavin Shan, 2023/09/06
- [PATCH v3 03/32] target/arm: Use generic helper to show CPU model names,
Gavin Shan <=
- [PATCH v3 04/32] target/avr: Use generic helper to show CPU model names, Gavin Shan, 2023/09/06
- [PATCH v3 05/32] target/cris: Use generic helper to show CPU model names, Gavin Shan, 2023/09/06
- [PATCH v3 06/32] target/hexagon: Use generic helper to show CPU model names, Gavin Shan, 2023/09/06
- [PATCH v3 07/32] target/i386: Use generic helper to show CPU model names, Gavin Shan, 2023/09/06
- [PATCH v3 08/32] target/loongarch: Use generic helper to show CPU model names, Gavin Shan, 2023/09/06
- [PATCH v3 09/32] target/m68k: Use generic helper to show CPU model names, Gavin Shan, 2023/09/06
- [PATCH v3 10/32] target/mips: Use generic helper to show CPU model names, Gavin Shan, 2023/09/06
- [PATCH v3 11/32] target/openrisc: Use generic helper to show CPU model names, Gavin Shan, 2023/09/06
- [PATCH v3 12/32] target/ppc: Use generic helper to show CPU model names, Gavin Shan, 2023/09/06