From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38519) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yqex8-0008DE-To for qemu-devel@nongnu.org; Fri, 08 May 2015 05:52:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yqex3-0006E2-P1 for qemu-devel@nongnu.org; Fri, 08 May 2015 05:52:18 -0400 Received: from e28smtp09.in.ibm.com ([122.248.162.9]:44811) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yqex3-0006DV-26 for qemu-devel@nongnu.org; Fri, 08 May 2015 05:52:13 -0400 Received: from /spool/local by e28smtp09.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 8 May 2015 15:22:10 +0530 Received: from d28relay02.in.ibm.com (d28relay02.in.ibm.com [9.184.220.59]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id 087AAE0045 for ; Fri, 8 May 2015 15:25:01 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay02.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t489prTj6619280 for ; Fri, 8 May 2015 15:21:53 +0530 Received: from d28av02.in.ibm.com (localhost [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t489H4fr020315 for ; Fri, 8 May 2015 14:47:05 +0530 From: Bharata B Rao Date: Fri, 8 May 2015 15:21:36 +0530 Message-Id: <1431078696-29519-4-git-send-email-bharata@linux.vnet.ibm.com> In-Reply-To: <1431078696-29519-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1431078696-29519-1-git-send-email-bharata@linux.vnet.ibm.com> Subject: [Qemu-devel] [RFC v1 PATCH 3/3] ppc: Move cpu_exec_init() call to realize function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: zhugh.fnst@cn.fujitsu.com, ehabkost@redhat.com, agraf@suse.de, Bharata B Rao , imammedo@redhat.com, afaerber@suse.de, david@gibson.dropbear.id.au 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. Signed-off-by: Bharata B Rao Reviewed-by: David Gibson --- 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 b915697..47fe3d6 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; @@ -9638,8 +9645,6 @@ static void ppc_cpu_initfn(Object *obj) CPUPPCState *env = &cpu->env; cs->env_ptr = env; - cpu_exec_init(env, NULL); - cpu->cpu_dt_id = cs->cpu_index; env->msr_mask = pcc->msr_mask; env->mmu_model = pcc->mmu_model; -- 2.1.0