[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 19/19] target-xtensa: move cpu_exec_realize() to rea
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PATCH 19/19] target-xtensa: move cpu_exec_realize() to realize function |
Date: |
Wed, 5 Oct 2016 21:38:53 +0200 |
I've removed the cannot_destroy_with_object_finalize_yet field as
cpu_exec_init() is not called by xtensa_cpu_initfn() anymore
(tested with QOM command provided by commit 4c315c27 with
"dc233c-xtensa-cpu")
CC: Max Filippov <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
target-xtensa/cpu.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/target-xtensa/cpu.c b/target-xtensa/cpu.c
index fc72726..79e7fa3 100644
--- a/target-xtensa/cpu.c
+++ b/target-xtensa/cpu.c
@@ -99,6 +99,13 @@ static void xtensa_cpu_realizefn(DeviceState *dev, Error
**errp)
{
CPUState *cs = CPU(dev);
XtensaCPUClass *xcc = XTENSA_CPU_GET_CLASS(dev);
+ Error *local_err = NULL;
+
+ cpu_exec_realize(cs, &local_err);
+ if (local_err != NULL) {
+ error_propagate(errp, local_err);
+ return;
+ }
cs->gdb_num_regs = xcc->config->gdb_regmap.num_regs;
@@ -118,7 +125,6 @@ static void xtensa_cpu_initfn(Object *obj)
cs->env_ptr = env;
env->config = xcc->config;
cpu_exec_init(cs, &error_abort);
- cpu_exec_realize(cs, &error_abort);
if (tcg_enabled() && !tcg_inited) {
tcg_inited = true;
@@ -159,13 +165,6 @@ static void xtensa_cpu_class_init(ObjectClass *oc, void
*data)
#endif
cc->debug_excp_handler = xtensa_breakpoint_handler;
dc->vmsd = &vmstate_xtensa_cpu;
-
- /*
- * Reason: xtensa_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 xtensa_cpu_type_info = {
--
2.7.4
- [Qemu-devel] [PATCH 12/19] target-moxie: move cpu_exec_realize() to realize function, (continued)
- [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
- [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 <=
- Re: [Qemu-devel] [PATCH 00/19] Split cpu_exec_init() into an init and a realize part, Peter Maydell, 2016/10/05
- Re: [Qemu-devel] [PATCH 00/19] Split cpu_exec_init() into an init and a realize part, Eduardo Habkost, 2016/10/05