I've removed the cannot_destroy_with_object_finalize_yet field as
unsafe references have been moved to cpu_exec_realize().
(tested with QOM command provided by commit 4c315c27 with
"any-m68k-cpu")
CC: Greg Ungerer <g...@uclinux.org>
Signed-off-by: Laurent Vivier <lviv...@redhat.com>
---
target-m68k/cpu.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/target-m68k/cpu.c b/target-m68k/cpu.c
index 2768bbb..f60a7a5 100644
--- a/target-m68k/cpu.c
+++ b/target-m68k/cpu.c
@@ -159,6 +159,13 @@ static void m68k_cpu_realizefn(DeviceState *dev, Error
**errp)
CPUState *cs = CPU(dev);
M68kCPU *cpu = M68K_CPU(dev);
M68kCPUClass *mcc = M68K_CPU_GET_CLASS(dev);
+ Error *local_err = NULL;
+
+ cpu_exec_realize(cs, &local_err);
+ if (local_err != NULL) {
+ error_propagate(errp, local_err);
+ return;
+ }
m68k_cpu_init_gdb(cpu);
@@ -177,7 +184,6 @@ static void m68k_cpu_initfn(Object *obj)
cs->env_ptr = env;
cpu_exec_init(cs);
- cpu_exec_realize(cs, &error_abort);
if (tcg_enabled() && !inited) {
inited = true;
@@ -223,13 +229,6 @@ static void m68k_cpu_class_init(ObjectClass *c, void *data)
cc->gdb_core_xml_file = "cf-core.xml";
dc->vmsd = &vmstate_m68k_cpu;
-
- /*
- * Reason: m68k_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 register_cpu_type(const M68kCPUInfo *info)
--
2.7.4
