| Message ID | 20231114235628.534334-11-gshan@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Unified CPU type check | expand |
On 11/14/23 15:56, Gavin Shan wrote: > Before it's applied: > > [gshan@gshan q]$ ./build/qemu-system-cris -cpu ? > Available CPUs: > crisv8 > crisv9 > crisv10 > crisv11 > crisv17 > crisv32 > > After it's applied: > > [gshan@gshan q]$ ./build/qemu-system-cris -cpu ? > Available CPUs: > crisv10 > crisv11 > crisv17 > crisv32 > crisv8 > crisv9 > > Signed-off-by: Gavin Shan <gshan@redhat.com> > --- > target/cris/cpu.c | 38 -------------------------------------- > target/cris/cpu.h | 3 --- > 2 files changed, 41 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On 15/11/23 00:56, Gavin Shan wrote: > Before it's applied: > > [gshan@gshan q]$ ./build/qemu-system-cris -cpu ? > Available CPUs: > crisv8 > crisv9 > crisv10 > crisv11 > crisv17 > crisv32 > > After it's applied: > > [gshan@gshan q]$ ./build/qemu-system-cris -cpu ? > Available CPUs: > crisv10 > crisv11 > crisv17 > crisv32 > crisv8 > crisv9 > > Signed-off-by: Gavin Shan <gshan@redhat.com> > --- > target/cris/cpu.c | 38 -------------------------------------- > target/cris/cpu.h | 3 --- > 2 files changed, 41 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
diff --git a/target/cris/cpu.c b/target/cris/cpu.c index a5083a0077..9ba08e8b0c 100644 --- a/target/cris/cpu.c +++ b/target/cris/cpu.c @@ -99,44 +99,6 @@ static ObjectClass *cris_cpu_class_by_name(const char *cpu_model) return oc; } -/* Sort alphabetically by VR. */ -static gint cris_cpu_list_compare(gconstpointer a, gconstpointer b) -{ - CRISCPUClass *ccc_a = CRIS_CPU_CLASS(a); - CRISCPUClass *ccc_b = CRIS_CPU_CLASS(b); - - /* */ - if (ccc_a->vr > ccc_b->vr) { - return 1; - } else if (ccc_a->vr < ccc_b->vr) { - return -1; - } else { - return 0; - } -} - -static void cris_cpu_list_entry(gpointer data, gpointer user_data) -{ - ObjectClass *oc = data; - const char *typename = object_class_get_name(oc); - char *name; - - name = g_strndup(typename, strlen(typename) - strlen(CRIS_CPU_TYPE_SUFFIX)); - qemu_printf(" %s\n", name); - g_free(name); -} - -void cris_cpu_list(void) -{ - GSList *list; - - list = object_class_get_list(TYPE_CRIS_CPU, false); - list = g_slist_sort(list, cris_cpu_list_compare); - qemu_printf("Available CPUs:\n"); - g_slist_foreach(list, cris_cpu_list_entry, NULL); - g_slist_free(list); -} - static void cris_cpu_realizefn(DeviceState *dev, Error **errp) { CPUState *cs = CPU(dev); diff --git a/target/cris/cpu.h b/target/cris/cpu.h index 1be7f90319..d830dcac5b 100644 --- a/target/cris/cpu.h +++ b/target/cris/cpu.h @@ -287,7 +287,4 @@ static inline void cpu_get_tb_cpu_state(CPUCRISState *env, vaddr *pc, | X_FLAG | PFIX_FLAG)); } -#define cpu_list cris_cpu_list -void cris_cpu_list(void); - #endif
Before it's applied: [gshan@gshan q]$ ./build/qemu-system-cris -cpu ? Available CPUs: crisv8 crisv9 crisv10 crisv11 crisv17 crisv32 After it's applied: [gshan@gshan q]$ ./build/qemu-system-cris -cpu ? Available CPUs: crisv10 crisv11 crisv17 crisv32 crisv8 crisv9 Signed-off-by: Gavin Shan <gshan@redhat.com> --- target/cris/cpu.c | 38 -------------------------------------- target/cris/cpu.h | 3 --- 2 files changed, 41 deletions(-)