| Message ID | 20250324185837.46506-8-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | cpus: Convert cpu_list definition to CPUClass:list_cpus callback | expand |
On Mon, Mar 24, 2025 at 07:58:37PM +0100, Philippe Mathieu-Daudé wrote: > Date: Mon, 24 Mar 2025 19:58:37 +0100 > From: Philippe Mathieu-Daudé <philmd@linaro.org> > Subject: [PATCH v3 7/7] cpus: Remove #ifdef check on cpu_list definition > X-Mailer: git-send-email 2.47.1 > > Since we removed all definitions of cpu_list, the #ifdef > check is always true. Remove it, inlining cpu_list(). > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Reviewed-by: Thomas Huth <thuth@redhat.com> > Reviewed-by: Richard Henderson <richard.henderson@linaro.org> > --- > cpu-target.c | 19 ++++++------------- > 1 file changed, 6 insertions(+), 13 deletions(-) Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
diff --git a/cpu-target.c b/cpu-target.c index 5947ca31a0a..30598619581 100644 --- a/cpu-target.c +++ b/cpu-target.c @@ -71,7 +71,6 @@ const char *parse_cpu_option(const char *cpu_option) return cpu_type; } -#ifndef cpu_list static void cpu_list_entry(gpointer data, gpointer user_data) { CPUClass *cc = CPU_CLASS(OBJECT_CLASS(data)); @@ -85,17 +84,6 @@ static void cpu_list_entry(gpointer data, gpointer user_data) } } -static void cpu_list(void) -{ - GSList *list; - - list = object_class_get_list_sorted(TYPE_CPU, false); - qemu_printf("Available CPUs:\n"); - g_slist_foreach(list, cpu_list_entry, NULL); - g_slist_free(list); -} -#endif - void list_cpus(void) { CPUClass *cc = CPU_CLASS(object_class_by_name(CPU_RESOLVING_TYPE)); @@ -103,7 +91,12 @@ void list_cpus(void) if (cc->list_cpus) { cc->list_cpus(); } else { - cpu_list(); + GSList *list; + + list = object_class_get_list_sorted(TYPE_CPU, false); + qemu_printf("Available CPUs:\n"); + g_slist_foreach(list, cpu_list_entry, NULL); + g_slist_free(list); } }