From patchwork Wed Oct 5 19:38:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 678577 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 3sq5qX3TNjz9sBr for ; Thu, 6 Oct 2016 06:45:44 +1100 (AEDT) Received: from localhost ([::1]:51014 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brs8L-00074l-EJ for incoming@patchwork.ozlabs.org; Wed, 05 Oct 2016 15:45:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46539) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brs2s-0001uk-MB for qemu-devel@nongnu.org; Wed, 05 Oct 2016 15:40:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1brs2p-0007pG-EG for qemu-devel@nongnu.org; Wed, 05 Oct 2016 15:40:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40296) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brs2p-0007pB-7A for qemu-devel@nongnu.org; Wed, 05 Oct 2016 15:39:59 -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 8AE638B978; Wed, 5 Oct 2016 19:39:58 +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 u95Jcsen010540; Wed, 5 Oct 2016 15:39:54 -0400 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 5 Oct 2016 21:38:46 +0200 Message-Id: <1475696333-8706-13-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.27]); Wed, 05 Oct 2016 19:39:58 +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 12/19] target-moxie: 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 , Anthony Green , 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 moxie_cpu_initfn() anymore (tested with QOM command provided by commit 4c315c27 with "moxie-cpu") CC: Anthony Green Signed-off-by: Laurent Vivier --- target-moxie/cpu.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/target-moxie/cpu.c b/target-moxie/cpu.c index 28beff1..51fa87a 100644 --- a/target-moxie/cpu.c +++ b/target-moxie/cpu.c @@ -61,6 +61,13 @@ static void moxie_cpu_realizefn(DeviceState *dev, Error **errp) { CPUState *cs = CPU(dev); MoxieCPUClass *mcc = MOXIE_CPU_GET_CLASS(dev); + Error *local_err = NULL; + + cpu_exec_realize(cs, &local_err); + if (local_err != NULL) { + error_propagate(errp, local_err); + return; + } qemu_init_vcpu(cs); cpu_reset(cs); @@ -76,7 +83,6 @@ static void moxie_cpu_initfn(Object *obj) cs->env_ptr = &cpu->env; cpu_exec_init(cs, &error_abort); - cpu_exec_realize(cs, &error_abort); if (tcg_enabled() && !inited) { inited = 1; @@ -125,13 +131,6 @@ static void moxie_cpu_class_init(ObjectClass *oc, void *data) cc->vmsd = &vmstate_moxie_cpu; #endif cc->disas_set_info = moxie_cpu_disas_set_info; - - /* - * Reason: moxie_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 moxielite_initfn(Object *obj)