[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/19] target-cris: move cpu_exec_realize() to reali
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PATCH 07/19] target-cris: move cpu_exec_realize() to realize function |
Date: |
Wed, 5 Oct 2016 21:38:41 +0200 |
I've removed the cannot_destroy_with_object_finalize_yet field as
cpu_exec_init() is not called by cris_cpu_initfn() anymore
(tested with QOM command provided by commit 4c315c27 with
"crisv17-cris-cpu")
CC: Edgar E. Iglesias <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
target-cris/cpu.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/target-cris/cpu.c b/target-cris/cpu.c
index 78753ed..e83d055 100644
--- a/target-cris/cpu.c
+++ b/target-cris/cpu.c
@@ -142,6 +142,13 @@ static void cris_cpu_realizefn(DeviceState *dev, Error
**errp)
{
CPUState *cs = CPU(dev);
CRISCPUClass *ccc = CRIS_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);
qemu_init_vcpu(cs);
@@ -188,7 +195,6 @@ static void cris_cpu_initfn(Object *obj)
cs->env_ptr = env;
cpu_exec_init(cs, &error_abort);
- cpu_exec_realize(cs, &error_abort);
env->pregs[PR_VR] = ccc->vr;
@@ -327,13 +333,6 @@ static void cris_cpu_class_init(ObjectClass *oc, void
*data)
cc->gdb_stop_before_watchpoint = true;
cc->disas_set_info = cris_disas_set_info;
-
- /*
- * Reason: cris_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 cris_cpu_type_info = {
--
2.7.4
- Re: [Qemu-devel] [PATCH 01/19] exec: split cpu_exec_init(), (continued)
[Qemu-devel] [PATCH 02/19] target-i386: move back cpu_exec_init() to init, Laurent Vivier, 2016/10/05
[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 <=
[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, 2016/10/05
[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