[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/19] target-moxie: move cpu_exec_realize() to real
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PATCH 12/19] target-moxie: move cpu_exec_realize() to realize function |
Date: |
Wed, 5 Oct 2016 21:38:46 +0200 |
I've removed the cannot_destroy_with_object_finalize_yet field as
cpu_exec_init() is not called by moxie_cpu_initfn() anymore
(tested with QOM command provided by commit 4c315c27 with
"moxie-cpu")
CC: Anthony Green <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
target-moxie/cpu.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/target-moxie/cpu.c b/target-moxie/cpu.c
index 28beff1..51fa87a 100644
--- a/target-moxie/cpu.c
+++ b/target-moxie/cpu.c
@@ -61,6 +61,13 @@ static void moxie_cpu_realizefn(DeviceState *dev, Error
**errp)
{
CPUState *cs = CPU(dev);
MoxieCPUClass *mcc = MOXIE_CPU_GET_CLASS(dev);
+ Error *local_err = NULL;
+
+ cpu_exec_realize(cs, &local_err);
+ if (local_err != NULL) {
+ error_propagate(errp, local_err);
+ return;
+ }
qemu_init_vcpu(cs);
cpu_reset(cs);
@@ -76,7 +83,6 @@ static void moxie_cpu_initfn(Object *obj)
cs->env_ptr = &cpu->env;
cpu_exec_init(cs, &error_abort);
- cpu_exec_realize(cs, &error_abort);
if (tcg_enabled() && !inited) {
inited = 1;
@@ -125,13 +131,6 @@ static void moxie_cpu_class_init(ObjectClass *oc, void
*data)
cc->vmsd = &vmstate_moxie_cpu;
#endif
cc->disas_set_info = moxie_cpu_disas_set_info;
-
- /*
- * Reason: moxie_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 moxielite_initfn(Object *obj)
--
2.7.4
- [Qemu-devel] [PATCH 03/19] target-ppc: move back cpu_exec_init() to init, (continued)
- [Qemu-devel] [PATCH 03/19] target-ppc: move back cpu_exec_init() to init, Laurent Vivier, 2016/10/05
- [Qemu-devel] [PATCH 04/19] target-s390: move back cpu_exec_init() to init, Laurent Vivier, 2016/10/05
- [Qemu-devel] [PATCH 05/19] target-arm: move cpu_exec_realize() to realize function, Laurent Vivier, 2016/10/05
- [Qemu-devel] [PATCH 06/19] target-alpha: move cpu_exec_realize() to realize function, Laurent Vivier, 2016/10/05
- [Qemu-devel] [PATCH 07/19] target-cris: move cpu_exec_realize() to realize function, Laurent Vivier, 2016/10/05
- [Qemu-devel] [PATCH 08/19] target-lm32: move cpu_exec_realize() to realize function, Laurent Vivier, 2016/10/05
- [Qemu-devel] [PATCH 09/19] target-m68k: move cpu_exec_realize() to realize function, Laurent Vivier, 2016/10/05
- [Qemu-devel] [PATCH 10/19] target-microblaze: move cpu_exec_realize() to realize function, Laurent Vivier, 2016/10/05
- [Qemu-devel] [PATCH 11/19] target-mips: move cpu_exec_realize() to realize function, Laurent Vivier, 2016/10/05
- [Qemu-devel] [PATCH 12/19] target-moxie: move cpu_exec_realize() to realize function,
Laurent Vivier <=
- [Qemu-devel] [PATCH 13/19] target-openrisc: move cpu_exec_realize() to realize function, Laurent Vivier, 2016/10/05
- [Qemu-devel] [PATCH 14/19] target-sh4: move cpu_exec_realize() to realize function, Laurent Vivier, 2016/10/05
- [Qemu-devel] [PATCH 15/19] target-sparc: move cpu_exec_realize() to realize function, Laurent Vivier, 2016/10/05
- [Qemu-devel] [PATCH 16/19] target-tilegx: move cpu_exec_realize() to realize function, Laurent Vivier, 2016/10/05
- [Qemu-devel] [PATCH 17/19] target-tricore: move cpu_exec_realize() to realize function, Laurent Vivier, 2016/10/05
- [Qemu-devel] [PATCH 18/19] target-unicore32: move cpu_exec_realize() to realize function, Laurent Vivier, 2016/10/05
- [Qemu-devel] [PATCH 19/19] target-xtensa: move cpu_exec_realize() to realize function, Laurent Vivier, 2016/10/05