From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1buipY-0004fq-QU for qemu-devel@nongnu.org; Thu, 13 Oct 2016 12:26:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1buipW-0008Fa-OR for qemu-devel@nongnu.org; Thu, 13 Oct 2016 12:26:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49182) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1buipW-0008FL-Hq for qemu-devel@nongnu.org; Thu, 13 Oct 2016 12:26:02 -0400 From: Laurent Vivier Date: Thu, 13 Oct 2016 18:24:57 +0200 Message-Id: <1476375902-11715-16-git-send-email-lvivier@redhat.com> In-Reply-To: <1476375902-11715-1-git-send-email-lvivier@redhat.com> References: <1476375902-11715-1-git-send-email-lvivier@redhat.com> Subject: [Qemu-devel] [PATCH v2 15/20] target-sparc: move cpu_exec_realize() to realize function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: David Gibson , Paolo Bonzini , Peter Maydell , Eduardo Habkost , Bharata B Rao , Markus Armbruster , Matthew Rosato , Laurent Vivier , Artyom Tarasenko 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 Signed-off-by: Laurent Vivier --- 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