[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 15/20] target-sparc: move cpu_exec_realize() to r
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PATCH v2 15/20] target-sparc: move cpu_exec_realize() to realize function |
Date: |
Thu, 13 Oct 2016 18:24:57 +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
"sparc-cpu")
CC: Artyom Tarasenko <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
target-sparc/cpu.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/target-sparc/cpu.c b/target-sparc/cpu.c
index 135f30c..d60cc65 100644
--- a/target-sparc/cpu.c
+++ b/target-sparc/cpu.c
@@ -792,7 +792,9 @@ static bool sparc_cpu_has_work(CPUState *cs)
static void sparc_cpu_realizefn(DeviceState *dev, Error **errp)
{
+ CPUState *cs = CPU(dev);
SPARCCPUClass *scc = SPARC_CPU_GET_CLASS(dev);
+ Error *local_err = NULL;
#if defined(CONFIG_USER_ONLY)
SPARCCPU *cpu = SPARC_CPU(dev);
CPUSPARCState *env = &cpu->env;
@@ -802,7 +804,13 @@ static void sparc_cpu_realizefn(DeviceState *dev, Error
**errp)
}
#endif
- qemu_init_vcpu(CPU(dev));
+ cpu_exec_realize(cs, &local_err);
+ if (local_err != NULL) {
+ error_propagate(errp, local_err);
+ return;
+ }
+
+ qemu_init_vcpu(cs);
scc->parent_realize(dev, errp);
}
@@ -815,7 +823,6 @@ static void sparc_cpu_initfn(Object *obj)
cs->env_ptr = env;
cpu_exec_init(cs);
- cpu_exec_realize(cs, &error_abort);
if (tcg_enabled()) {
gen_intermediate_code_init(env);
@@ -868,13 +875,6 @@ static void sparc_cpu_class_init(ObjectClass *oc, void
*data)
#else
cc->gdb_num_core_regs = 72;
#endif
-
- /*
- * Reason: sparc_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 sparc_cpu_type_info = {
--
2.7.4
- [Qemu-devel] [PATCH v2 07/20] target-cris: move cpu_exec_realize() to realize function, (continued)
- [Qemu-devel] [PATCH v2 07/20] target-cris: move cpu_exec_realize() to realize function, Laurent Vivier, 2016/10/13
- [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 <=
- [Qemu-devel] [PATCH v2 16/20] target-tilegx: move cpu_exec_realize() to realize function, Laurent Vivier, 2016/10/13
- [Qemu-devel] [PATCH v2 17/20] target-tricore: move cpu_exec_realize() to realize function, Laurent Vivier, 2016/10/13
- [Qemu-devel] [PATCH v2 18/20] target-unicore32: move cpu_exec_realize() to realize function, Laurent Vivier, 2016/10/13
- [Qemu-devel] [PATCH v2 19/20] target-xtensa: move cpu_exec_realize() to realize function, Laurent Vivier, 2016/10/13
- [Qemu-devel] [PATCH v2 20/20] exec: move cpu_exec_init() to cpu_common_initfn(), Laurent Vivier, 2016/10/13