I've removed the cannot_destroy_with_object_finalize_yet field as
cpu_exec_init() is not called by tricore_cpu_initfn() anymore
(tested with QOM command provided by commit 4c315c27 with
"tc1796-tricore-cpu")
CC: Bastian Koppelmann <kbast...@mail.uni-paderborn.de>
Signed-off-by: Laurent Vivier <lviv...@redhat.com>
---
target-tricore/cpu.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/target-tricore/cpu.c b/target-tricore/cpu.c
index 2fd3325..6a57aa9 100644
--- a/target-tricore/cpu.c
+++ b/target-tricore/cpu.c
@@ -69,6 +69,13 @@ static void tricore_cpu_realizefn(DeviceState *dev, Error
**errp)
TriCoreCPU *cpu = TRICORE_CPU(dev);
TriCoreCPUClass *tcc = TRICORE_CPU_GET_CLASS(dev);
CPUTriCoreState *env = &cpu->env;
+ Error *local_err = NULL;
+
+ cpu_exec_realize(cs, &local_err);
+ if (local_err != NULL) {
+ error_propagate(errp, local_err);
+ return;
+ }
/* Some features automatically imply others */
if (tricore_feature(env, TRICORE_FEATURE_161)) {
@@ -96,7 +103,6 @@ static void tricore_cpu_initfn(Object *obj)
cs->env_ptr = env;
cpu_exec_init(cs, &error_abort);
- cpu_exec_realize(cs, &error_abort);
if (tcg_enabled()) {
tricore_tcg_init();
@@ -173,13 +179,6 @@ static void tricore_cpu_class_init(ObjectClass *c, void
*data)
cc->dump_state = tricore_cpu_dump_state;
cc->set_pc = tricore_cpu_set_pc;
cc->synchronize_from_tb = tricore_cpu_synchronize_from_tb;
-
- /*
- * Reason: tricore_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 cpu_register(const TriCoreCPUInfo *info)
--
2.7.4
