Introduce realizefn and set realized = true from cpu_cris_init(). Signed-off-by: Andreas Färber <afaer...@suse.de> --- target-cris/cpu.c | 11 +++++++++++ target-cris/translate.c | 3 +-- 2 Dateien geändert, 12 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-)
diff --git a/target-cris/cpu.c b/target-cris/cpu.c index 3f64a57..4d9d831 100644 --- a/target-cris/cpu.c +++ b/target-cris/cpu.c @@ -55,6 +55,14 @@ static void cris_cpu_reset(CPUState *s) #endif } +static void cris_cpu_realizefn(DeviceState *dev, Error **errp) +{ + CRISCPU *cpu = CRIS_CPU(dev); + + cpu_reset(CPU(cpu)); + qemu_init_vcpu(&cpu->env); +} + static void cris_cpu_initfn(Object *obj) { CRISCPU *cpu = CRIS_CPU(obj); @@ -65,9 +73,12 @@ static void cris_cpu_initfn(Object *obj) static void cris_cpu_class_init(ObjectClass *oc, void *data) { + DeviceClass *dc = DEVICE_CLASS(oc); CPUClass *cc = CPU_CLASS(oc); CRISCPUClass *ccc = CRIS_CPU_CLASS(oc); + dc->realize = cris_cpu_realizefn; + ccc->parent_reset = cc->reset; cc->reset = cris_cpu_reset; } diff --git a/target-cris/translate.c b/target-cris/translate.c index 09e6011..25ff490 100644 --- a/target-cris/translate.c +++ b/target-cris/translate.c @@ -3558,8 +3558,7 @@ CRISCPU *cpu_cris_init(const char *cpu_model) env->pregs[PR_VR] = vr_by_name(cpu_model); - cpu_reset(CPU(cpu)); - qemu_init_vcpu(env); + object_property_set_bool(OBJECT(cpu), true, "realized", NULL); if (tcg_initialized) { return cpu; -- 1.7.10.4