From patchwork Thu Jun 18 17:24:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 486451 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 BB47F14027C for ; Fri, 19 Jun 2015 03:25:44 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=GaMA6Png; dkim-atps=neutral Received: from localhost ([::1]:54172 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5dZN-0002nl-Ko for incoming@patchwork.ozlabs.org; Thu, 18 Jun 2015 13:25:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47544) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5dYt-0001vM-0X for qemu-devel@nongnu.org; Thu, 18 Jun 2015 13:25:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5dYr-00078T-Oa for qemu-devel@nongnu.org; Thu, 18 Jun 2015 13:25:10 -0400 Received: from mail-pa0-x22b.google.com ([2607:f8b0:400e:c03::22b]:33162) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5dYr-00077a-Bm for qemu-devel@nongnu.org; Thu, 18 Jun 2015 13:25:09 -0400 Received: by padev16 with SMTP id ev16so65739710pad.0 for ; Thu, 18 Jun 2015 10:25:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NwmJ4Yoj7B9UrJPuoJ1cy78Z7XpG/7CntOIbwR8Ah2Q=; b=GaMA6PngCNfVOWrs8NkNn7O+zel/t/x2v4vn1dEwqNbIv8h+jD5OSQe9paCIg+k+yt 3VYTXeNeCtv5WUTY5XqzP4Amk1AlaXm3TJ7EZz9ZmT/on0ZgkIF8cPE9t831HWMWQAH9 Pcoa5kY4keSaIwVluox5JIfKDQ7rWn1lmh1nCSkfoN5ikLWN5qMT7YMbeTkjpOlQQsL9 fr2Qn2qeP7/QR4sHDqy0VMcdl/mcMSuVudWZVbZ/ZkbtPBO7ndR0lc+wnQaLjWvNhOsi N70Br6IDyKz7IAB/Mbsk50r7Lom6i71i9WN4hOiG3dLo0SwxRtCrWZH9xhECKt8ORLXS 6b3g== X-Received: by 10.68.109.67 with SMTP id hq3mr22989350pbb.83.1434648308583; Thu, 18 Jun 2015 10:25:08 -0700 (PDT) Received: from pcrost-laptop.hsd1.ca.comcast.net (c-73-15-58-35.hsd1.ca.comcast.net. [73.15.58.35]) by mx.google.com with ESMTPSA id cz1sm8605105pbc.84.2015.06.18.10.25.06 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Jun 2015 10:25:07 -0700 (PDT) From: Peter Crosthwaite X-Google-Original-From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Thu, 18 Jun 2015 10:24:50 -0700 Message-Id: <1434648295-30584-4-git-send-email-crosthwaite.peter@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1434648295-30584-1-git-send-email-crosthwaite.peter@gmail.com> References: <1434648295-30584-1-git-send-email-crosthwaite.peter@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::22b Cc: ehabkost@redhat.com, Peter Crosthwaite , Bharata B Rao , afaerber@suse.de, aurelien@aurel32.net, rth@twiddle.net Subject: [Qemu-devel] [PATCH v3 3/8] ppc: Move cpu_exec_init() call to realize function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Bharata B Rao Move cpu_exec_init() call from instance_init to realize. This allows any failures from cpu_exec_init() to be handled appropriately. Also add corresponding cpu_exec_exit() call from unrealize. cpu_dt_id assignment from instance_init is no longer needed since correct assignment for cpu_dt_id is already present in realizefn. Signed-off-by: Bharata B Rao Reviewed-by: David Gibson Reviewed-by: Peter Crosthwaite Acked-by: Paolo Bonzini Signed-off-by: Peter Crosthwaite --- target-ppc/translate_init.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 52d95ce..2b72f2d 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -8928,6 +8928,11 @@ static void ppc_cpu_realizefn(DeviceState *dev, Error **errp) return; } + cpu_exec_init(&cpu->env, &local_err); + if (local_err != NULL) { + error_propagate(errp, local_err); + return; + } cpu->cpu_dt_id = (cs->cpu_index / smp_threads) * max_smt + (cs->cpu_index % smp_threads); #endif @@ -9141,6 +9146,8 @@ static void ppc_cpu_unrealizefn(DeviceState *dev, Error **errp) opc_handler_t **table; int i, j; + cpu_exec_exit(CPU(dev)); + for (i = 0; i < PPC_CPU_OPCODES_LEN; i++) { if (env->opcodes[i] == &invalid_handler) { continue; @@ -9633,8 +9640,6 @@ static void ppc_cpu_initfn(Object *obj) CPUPPCState *env = &cpu->env; cs->env_ptr = env; - cpu_exec_init(env, &error_abort); - cpu->cpu_dt_id = cs->cpu_index; env->msr_mask = pcc->msr_mask; env->mmu_model = pcc->mmu_model;