@@ -154,7 +154,20 @@ static void avr_cpu_initfn(Object *obj)
static ObjectClass *avr_cpu_class_by_name(const char *cpu_model)
{
- return object_class_by_name(cpu_model);
+ ObjectClass *oc;
+ char *typename;
+
+ oc = object_class_by_name(cpu_model);
+ if (object_class_dynamic_cast(oc, TYPE_AVR_CPU) &&
+ !object_class_is_abstract(oc)) {
+ return oc;
+ }
+
+ typename = g_strdup_printf(AVR_CPU_TYPE_NAME("%s"), cpu_model);
+ oc = object_class_by_name(typename);
+ g_free(typename);
+
+ return oc;
}
static void avr_cpu_dump_state(CPUState *cs, FILE *f, int flags)
@@ -357,14 +370,17 @@ typedef struct AVRCPUInfo {
static void avr_cpu_list_entry(gpointer data, gpointer user_data)
{
const char *typename = object_class_get_name(OBJECT_CLASS(data));
+ char *model = cpu_model_from_type(typename);
- qemu_printf("%s\n", typename);
+ qemu_printf(" %s\n", model);
+ g_free(model);
}
void avr_cpu_list(void)
{
GSList *list;
list = object_class_get_list_sorted(TYPE_AVR_CPU, false);
+ qemu_printf("Available CPUs:\n");
g_slist_foreach(list, avr_cpu_list_entry, NULL);
g_slist_free(list);
}
For target/avr, the registered CPU type name is always the combination of the CPU model name and suffix. Use cpu_model_from_type() to show the CPU model names. Besides, the conversion from CPU model name to CPU type name needs to be supported in avr_cpu_class_by_name(). Signed-off-by: Gavin Shan <gshan@redhat.com> --- target/avr/cpu.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)