@@ -299,15 +299,12 @@ struct ArchCPU {
CPUOpenRISCState env;
};
-void cpu_openrisc_list(void);
void openrisc_cpu_dump_state(CPUState *cpu, FILE *f, int flags);
int openrisc_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg);
int openrisc_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);
void openrisc_translate_init(void);
int print_insn_or1k(bfd_vma addr, disassemble_info *info);
-#define cpu_list cpu_openrisc_list
-
#ifndef CONFIG_USER_ONLY
hwaddr openrisc_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
@@ -253,48 +253,6 @@ static void openrisc_cpu_class_init(ObjectClass *oc, void *data)
cc->tcg_ops = &openrisc_tcg_ops;
}
-/* Sort alphabetically by type name, except for "any". */
-static gint openrisc_cpu_list_compare(gconstpointer a, gconstpointer b)
-{
- ObjectClass *class_a = (ObjectClass *)a;
- ObjectClass *class_b = (ObjectClass *)b;
- const char *name_a, *name_b;
-
- name_a = object_class_get_name(class_a);
- name_b = object_class_get_name(class_b);
- if (strcmp(name_a, "any-" TYPE_OPENRISC_CPU) == 0) {
- return 1;
- } else if (strcmp(name_b, "any-" TYPE_OPENRISC_CPU) == 0) {
- return -1;
- } else {
- return strcmp(name_a, name_b);
- }
-}
-
-static void openrisc_cpu_list_entry(gpointer data, gpointer user_data)
-{
- ObjectClass *oc = data;
- const char *typename;
- char *name;
-
- typename = object_class_get_name(oc);
- name = g_strndup(typename,
- strlen(typename) - strlen("-" TYPE_OPENRISC_CPU));
- qemu_printf(" %s\n", name);
- g_free(name);
-}
-
-void cpu_openrisc_list(void)
-{
- GSList *list;
-
- list = object_class_get_list(TYPE_OPENRISC_CPU, false);
- list = g_slist_sort(list, openrisc_cpu_list_compare);
- qemu_printf("Available CPUs:\n");
- g_slist_foreach(list, openrisc_cpu_list_entry, NULL);
- g_slist_free(list);
-}
-
#define DEFINE_OPENRISC_CPU_TYPE(cpu_model, initfn) \
{ \
.parent = TYPE_OPENRISC_CPU, \