openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

hppa: replace cpu_hppa_init() with cpu_generic_init() 

drop custom cpu_hppa_init() in favor of cpu_generic_init(),
to make cpu_generic_init() work all we need is to provide
cc->class_by_name callback that would resolve any cpu_model
to the sole TYPE_HPPA_CPU to match current behaviour.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Acked-by: Richard Henderson <rth@twiddle.net>
Message-Id: <1503592308-93913-11-git-send-email-imammedo@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Igor Mammedov 2017-08-24 18:31:33 +02:00 committed by Eduardo Habkost
parent 82a3d1f81f
commit 8fc24ad5dd
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
target/hppa/cpu.c
View File

@ -112,15 +112,9 @@ static void hppa_cpu_initfn(Object *obj)
hppa_translate_init();
}
HPPACPU *cpu_hppa_init(const char *cpu_model)
static ObjectClass *hppa_cpu_class_by_name(const char *cpu_model)
{
HPPACPU *cpu;
cpu = HPPA_CPU(object_new(TYPE_HPPA_CPU));
object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
return cpu;
return object_class_by_name(TYPE_HPPA_CPU);
}
static void hppa_cpu_class_init(ObjectClass *oc, void *data)
@ -132,6 +126,7 @@ static void hppa_cpu_class_init(ObjectClass *oc, void *data)
acc->parent_realize = dc->realize;
dc->realize = hppa_cpu_realizefn;
cc->class_by_name = hppa_cpu_class_by_name;
cc->do_interrupt = hppa_cpu_do_interrupt;
cc->cpu_exec_interrupt = hppa_cpu_exec_interrupt;
cc->dump_state = hppa_cpu_dump_state;

4
target/hppa/cpu.h
View File

@ -112,9 +112,7 @@ static inline int cpu_mmu_index(CPUHPPAState *env, bool ifetch)
void hppa_translate_init(void);
HPPACPU *cpu_hppa_init(const char *cpu_model);
#define cpu_init(cpu_model) CPU(cpu_hppa_init(cpu_model))
#define cpu_init(cpu_model) cpu_generic_init(TYPE_HPPA_CPU, cpu_model)
void hppa_cpu_list(FILE *f, fprintf_function cpu_fprintf);