[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 07/20] target-cris: move cpu_exec_realize() to re
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PATCH v2 07/20] target-cris: move cpu_exec_realize() to realize function |
Date: |
Thu, 13 Oct 2016 18:24:49 +0200 |
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
"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 e28abc1..d50ead5 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);
- 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
- [Qemu-devel] [PATCH v2 00/20] Split cpu_exec_init() into an init and a realize part, Laurent Vivier, 2016/10/13
- [Qemu-devel] [PATCH v2 01/20] exec: split cpu_exec_init(), Laurent Vivier, 2016/10/13
- [Qemu-devel] [PATCH v2 02/20] target-i386: move back cpu_exec_init() to init, Laurent Vivier, 2016/10/13
- [Qemu-devel] [PATCH v2 03/20] target-ppc: move back cpu_exec_init() to init, Laurent Vivier, 2016/10/13
- [Qemu-devel] [PATCH v2 04/20] target-s390: move back cpu_exec_init() to init, Laurent Vivier, 2016/10/13
- [Qemu-devel] [PATCH v2 07/20] target-cris: move cpu_exec_realize() to realize function,
Laurent Vivier <=
- [Qemu-devel] [PATCH v2 06/20] target-alpha: move cpu_exec_realize() to realize function, Laurent Vivier, 2016/10/13
- [Qemu-devel] [PATCH v2 05/20] target-arm: move cpu_exec_realize() to realize function, Laurent Vivier, 2016/10/13
- [Qemu-devel] [PATCH v2 08/20] target-lm32: move cpu_exec_realize() to realize function, Laurent Vivier, 2016/10/13
- [Qemu-devel] [PATCH v2 09/20] target-m68k: move cpu_exec_realize() to realize function, Laurent Vivier, 2016/10/13
- [Qemu-devel] [PATCH v2 10/20] target-microblaze: move cpu_exec_realize() to realize function, Laurent Vivier, 2016/10/13
- [Qemu-devel] [PATCH v2 11/20] target-mips: move cpu_exec_realize() to realize function, Laurent Vivier, 2016/10/13
- [Qemu-devel] [PATCH v2 12/20] target-moxie: move cpu_exec_realize() to realize function, Laurent Vivier, 2016/10/13
- [Qemu-devel] [PATCH v2 13/20] target-openrisc: move cpu_exec_realize() to realize function, Laurent Vivier, 2016/10/13
- [Qemu-devel] [PATCH v2 14/20] target-sh4: move cpu_exec_realize() to realize function, Laurent Vivier, 2016/10/13
- [Qemu-devel] [PATCH v2 15/20] target-sparc: move cpu_exec_realize() to realize function, Laurent Vivier, 2016/10/13