@@ -144,6 +144,13 @@ static void lm32_cpu_realizefn(DeviceState *dev, Error **errp)
{
CPUState *cs = CPU(dev);
LM32CPUClass *lcc = LM32_CPU_GET_CLASS(dev);
+ Error *local_err = NULL;
+
+ cpu_exec_realize(cs, &local_err);
+ if (local_err != NULL) {
+ error_propagate(errp, local_err);
+ return;
+ }
cpu_reset(cs);
@@ -161,7 +168,6 @@ static void lm32_cpu_initfn(Object *obj)
cs->env_ptr = env;
cpu_exec_init(cs, &error_abort);
- cpu_exec_realize(cs, &error_abort);
env->flags = 0;
@@ -286,13 +292,6 @@ static void lm32_cpu_class_init(ObjectClass *oc, void *data)
cc->gdb_stop_before_watchpoint = true;
cc->debug_excp_handler = lm32_debug_excp_handler;
cc->disas_set_info = lm32_cpu_disas_set_info;
-
- /*
- * Reason: lm32_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 void lm32_register_cpu_type(const LM32CPUInfo *info)
I've removed the cannot_destroy_with_object_finalize_yet field as cpu_exec_init() is not called by lm32_cpu_initfn() anymore (tested with QOM command provided by commit 4c315c27 with "lm32-full-lm32-cpu") CC: Michael Walle <michael@walle.cc> Signed-off-by: Laurent Vivier <lvivier@redhat.com> --- target-lm32/cpu.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)