From patchwork Wed Oct 5 19:38:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 678575 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 3sq5pb2Pnqz9sDG for ; Thu, 6 Oct 2016 06:44:54 +1100 (AEDT) Received: from localhost ([::1]:51007 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brs7S-0006H8-Rm for incoming@patchwork.ozlabs.org; Wed, 05 Oct 2016 15:44:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46332) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brs28-0001G3-Kn for qemu-devel@nongnu.org; Wed, 05 Oct 2016 15:39:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1brs26-0007Z2-F7 for qemu-devel@nongnu.org; Wed, 05 Oct 2016 15:39:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60546) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1brs26-0007Yt-8d; Wed, 05 Oct 2016 15:39:14 -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 ADF6067ECE; Wed, 5 Oct 2016 19:39:13 +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 u95Jcsee010540; Wed, 5 Oct 2016 15:39:09 -0400 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 5 Oct 2016 21:38:37 +0200 Message-Id: <1475696333-8706-4-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.38]); Wed, 05 Oct 2016 19:39:13 +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 03/19] target-ppc: move back cpu_exec_init() to init 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 , Markus Armbruster , Alexander Graf , qemu-ppc@nongnu.org, Bharata B Rao , Paolo Bonzini , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We have now the cpu_exec_realize() in realize, so the init part must be in init CC: Alexander Graf CC: qemu-ppc@nongnu.org Signed-off-by: Laurent Vivier --- target-ppc/translate_init.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 5e84e65..5eb2d3a 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -9678,11 +9678,6 @@ static void ppc_cpu_realizefn(DeviceState *dev, Error **errp) } #endif - cpu_exec_init(cs, &local_err); - if (local_err != NULL) { - error_propagate(errp, local_err); - return; - } cpu_exec_realize(cs, &local_err); if (local_err != NULL) { error_propagate(errp, local_err); @@ -10439,6 +10434,7 @@ static void ppc_cpu_initfn(Object *obj) CPUPPCState *env = &cpu->env; cs->env_ptr = env; + cpu_exec_init(cs, &error_abort); env->msr_mask = pcc->msr_mask; env->mmu_model = pcc->mmu_model;