From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brs3D-0002JD-CF for qemu-devel@nongnu.org; Wed, 05 Oct 2016 15:40:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1brs39-00082a-47 for qemu-devel@nongnu.org; Wed, 05 Oct 2016 15:40:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41303) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brs38-00081z-Tm for qemu-devel@nongnu.org; Wed, 05 Oct 2016 15:40:19 -0400 From: Laurent Vivier Date: Wed, 5 Oct 2016 21:38:50 +0200 Message-Id: <1475696333-8706-17-git-send-email-lvivier@redhat.com> In-Reply-To: <1475696333-8706-1-git-send-email-lvivier@redhat.com> References: <1475696333-8706-1-git-send-email-lvivier@redhat.com> Subject: [Qemu-devel] [PATCH 16/19] target-tilegx: 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 , Markus Armbruster , Eduardo Habkost , Bharata B Rao , Peter Maydell , Matthew Rosato , Laurent Vivier , Chen Gang I've removed the cannot_destroy_with_object_finalize_yet field as cpu_exec_init() is not called by tilegx_cpu_initfn() anymore (not tested with QOM command as tilegx is only available in linux-user mode) CC: Chen Gang Signed-off-by: Laurent Vivier --- target-tilegx/cpu.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/target-tilegx/cpu.c b/target-tilegx/cpu.c index f7ec920..6be69ef 100644 --- a/target-tilegx/cpu.c +++ b/target-tilegx/cpu.c @@ -92,6 +92,13 @@ static void tilegx_cpu_realizefn(DeviceState *dev, Error **errp) { CPUState *cs = CPU(dev); TileGXCPUClass *tcc = TILEGX_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); @@ -108,7 +115,6 @@ static void tilegx_cpu_initfn(Object *obj) cs->env_ptr = env; cpu_exec_init(cs, &error_abort); - cpu_exec_realize(cs, &error_abort); if (tcg_enabled() && !tcg_initialized) { tcg_initialized = true; @@ -163,13 +169,6 @@ static void tilegx_cpu_class_init(ObjectClass *oc, void *data) cc->set_pc = tilegx_cpu_set_pc; cc->handle_mmu_fault = tilegx_cpu_handle_mmu_fault; cc->gdb_num_core_regs = 0; - - /* - * Reason: tilegx_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 tilegx_cpu_type_info = { -- 2.7.4