diff options
Diffstat (limited to 'target-s390x/cpu.c')
| -rw-r--r-- | target-s390x/cpu.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index d765e7b984..b74654724d 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -97,15 +97,29 @@ static void s390_cpu_machine_reset_cb(void *opaque) } #endif +static void s390_cpu_realizefn(DeviceState *dev, Error **errp) +{ + S390CPU *cpu = S390_CPU(dev); + S390CPUClass *scc = S390_CPU_GET_CLASS(dev); + + qemu_init_vcpu(&cpu->env); + cpu_reset(CPU(cpu)); + + scc->parent_realize(dev, errp); +} + static void s390_cpu_initfn(Object *obj) { + CPUState *cs = CPU(obj); S390CPU *cpu = S390_CPU(obj); CPUS390XState *env = &cpu->env; + static bool inited; static int cpu_num = 0; #if !defined(CONFIG_USER_ONLY) struct tm tm; #endif + cs->env_ptr = env; cpu_exec_init(env); #if !defined(CONFIG_USER_ONLY) qemu_register_reset(s390_cpu_machine_reset_cb, cpu); @@ -123,7 +137,10 @@ static void s390_cpu_initfn(Object *obj) env->cpu_num = cpu_num++; env->ext_index = -1; - cpu_reset(CPU(cpu)); + if (tcg_enabled() && !inited) { + inited = true; + s390x_translate_init(); + } } static void s390_cpu_finalize(Object *obj) @@ -146,6 +163,9 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data) CPUClass *cc = CPU_CLASS(scc); DeviceClass *dc = DEVICE_CLASS(oc); + scc->parent_realize = dc->realize; + dc->realize = s390_cpu_realizefn; + scc->parent_reset = cc->reset; cc->reset = s390_cpu_reset; |