@@ -792,7 +792,9 @@ static bool sparc_cpu_has_work(CPUState *cs)
static void sparc_cpu_realizefn(DeviceState *dev, Error **errp)
{
+ CPUState *cs = CPU(dev);
SPARCCPUClass *scc = SPARC_CPU_GET_CLASS(dev);
+ Error *local_err = NULL;
#if defined(CONFIG_USER_ONLY)
SPARCCPU *cpu = SPARC_CPU(dev);
CPUSPARCState *env = &cpu->env;
@@ -802,7 +804,13 @@ static void sparc_cpu_realizefn(DeviceState *dev, Error **errp)
}
#endif
- qemu_init_vcpu(CPU(dev));
+ cpu_exec_realize(cs, &local_err);
+ if (local_err != NULL) {
+ error_propagate(errp, local_err);
+ return;
+ }
+
+ qemu_init_vcpu(cs);
scc->parent_realize(dev, errp);
}
@@ -815,7 +823,6 @@ static void sparc_cpu_initfn(Object *obj)
cs->env_ptr = env;
cpu_exec_init(cs, &error_abort);
- cpu_exec_realize(cs, &error_abort);
if (tcg_enabled()) {
gen_intermediate_code_init(env);
@@ -868,13 +875,6 @@ static void sparc_cpu_class_init(ObjectClass *oc, void *data)
#else
cc->gdb_num_core_regs = 72;
#endif
-
- /*
- * Reason: sparc_cpu_initfn() calls cpu_exec_init(), which saves
- * the object in cpus -> dangling pointer after final
- * object_unref().
- */
- dc->cannot_destroy_with_object_finalize_yet = true;
}
static const TypeInfo sparc_cpu_type_info = {
I've removed the cannot_destroy_with_object_finalize_yet field as cpu_exec_init() is not called by sparc_cpu_initfn() anymore (tested with QOM command provided by commit 4c315c27 with "sparc-cpu") CC: Artyom Tarasenko <atar4qemu@gmail.com> Signed-off-by: Laurent Vivier <lvivier@redhat.com> --- target-sparc/cpu.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)