From patchwork Wed Oct 5 19:38:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 678585 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sq61Q07Plz9sdn for ; Thu, 6 Oct 2016 06:54:18 +1100 (AEDT) Received: from localhost ([::1]:51054 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brsGc-0005l2-PR for incoming@patchwork.ozlabs.org; Wed, 05 Oct 2016 15:54:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46440) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brs2R-0001Y0-62 for qemu-devel@nongnu.org; Wed, 05 Oct 2016 15:39:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1brs2Q-0007g7-4h for qemu-devel@nongnu.org; Wed, 05 Oct 2016 15:39:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59924) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brs2P-0007fv-Uh for qemu-devel@nongnu.org; Wed, 05 Oct 2016 15:39:34 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 61657C008AE3; Wed, 5 Oct 2016 19:39:33 +0000 (UTC) Received: from thinkpad.redhat.com (ovpn-112-35.ams2.redhat.com [10.36.112.35]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u95Jcsei010540; Wed, 5 Oct 2016 15:39:28 -0400 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 5 Oct 2016 21:38:41 +0200 Message-Id: <1475696333-8706-8-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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 05 Oct 2016 19:39:33 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 07/19] target-cris: move cpu_exec_realize() to realize function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Matthew Rosato , Peter Maydell , Eduardo Habkost , Laurent Vivier , "Edgar E . Iglesias" , Markus Armbruster , Bharata B Rao , Paolo Bonzini , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" I've removed the cannot_destroy_with_object_finalize_yet field as cpu_exec_init() is not called by cris_cpu_initfn() anymore (tested with QOM command provided by commit 4c315c27 with "crisv17-cris-cpu") CC: Edgar E. Iglesias Signed-off-by: Laurent Vivier --- target-cris/cpu.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/target-cris/cpu.c b/target-cris/cpu.c index 78753ed..e83d055 100644 --- a/target-cris/cpu.c +++ b/target-cris/cpu.c @@ -142,6 +142,13 @@ static void cris_cpu_realizefn(DeviceState *dev, Error **errp) { CPUState *cs = CPU(dev); CRISCPUClass *ccc = CRIS_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); @@ -188,7 +195,6 @@ static void cris_cpu_initfn(Object *obj) cs->env_ptr = env; cpu_exec_init(cs, &error_abort); - cpu_exec_realize(cs, &error_abort); env->pregs[PR_VR] = ccc->vr; @@ -327,13 +333,6 @@ static void cris_cpu_class_init(ObjectClass *oc, void *data) cc->gdb_stop_before_watchpoint = true; cc->disas_set_info = cris_disas_set_info; - - /* - * Reason: cris_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 cris_cpu_type_info = {