[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 09/20] target-m68k: move cpu_exec_realize() to re
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PATCH v2 09/20] target-m68k: move cpu_exec_realize() to realize function |
Date: |
Thu, 13 Oct 2016 18:24:51 +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
"any-m68k-cpu")
CC: Greg Ungerer <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
target-m68k/cpu.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/target-m68k/cpu.c b/target-m68k/cpu.c
index 2768bbb..f60a7a5 100644
--- a/target-m68k/cpu.c
+++ b/target-m68k/cpu.c
@@ -159,6 +159,13 @@ static void m68k_cpu_realizefn(DeviceState *dev, Error
**errp)
CPUState *cs = CPU(dev);
M68kCPU *cpu = M68K_CPU(dev);
M68kCPUClass *mcc = M68K_CPU_GET_CLASS(dev);
+ Error *local_err = NULL;
+
+ cpu_exec_realize(cs, &local_err);
+ if (local_err != NULL) {
+ error_propagate(errp, local_err);
+ return;
+ }
m68k_cpu_init_gdb(cpu);
@@ -177,7 +184,6 @@ static void m68k_cpu_initfn(Object *obj)
cs->env_ptr = env;
cpu_exec_init(cs);
- cpu_exec_realize(cs, &error_abort);
if (tcg_enabled() && !inited) {
inited = true;
@@ -223,13 +229,6 @@ static void m68k_cpu_class_init(ObjectClass *c, void *data)
cc->gdb_core_xml_file = "cf-core.xml";
dc->vmsd = &vmstate_m68k_cpu;
-
- /*
- * Reason: m68k_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 register_cpu_type(const M68kCPUInfo *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, 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 <=
- [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
- [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