From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37875) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyEnp-0000hj-3z for qemu-devel@nongnu.org; Fri, 29 May 2015 03:34:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YyEnl-0008Dg-Qj for qemu-devel@nongnu.org; Fri, 29 May 2015 03:34:01 -0400 Received: from e28smtp09.in.ibm.com ([122.248.162.9]:39037) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyEnl-00089X-6d for qemu-devel@nongnu.org; Fri, 29 May 2015 03:33:57 -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, 29 May 2015 13:03:51 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 3DF893940048 for ; Fri, 29 May 2015 13:03:50 +0530 (IST) Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay03.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t4T7Xm8H1180156 for ; Fri, 29 May 2015 13:03:49 +0530 Received: from d28av01.in.ibm.com (localhost [127.0.0.1]) by d28av01.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t4T7Xl5b013319 for ; Fri, 29 May 2015 13:03:48 +0530 Date: Fri, 29 May 2015 13:03:10 +0530 From: Bharata B Rao Message-ID: <20150529073310.GC597@in.ibm.com> References: <1432184528-31252-1-git-send-email-bharata@linux.vnet.ibm.com> <1432184528-31252-4-git-send-email-bharata@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: Re: [Qemu-devel] [PATCH v3 3/3] ppc: Move cpu_exec_init() call to realize function Reply-To: bharata@linux.vnet.ibm.com List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Crosthwaite Cc: zhugh.fnst@cn.fujitsu.com, Eduardo Habkost , Alexander Graf , "qemu-devel@nongnu.org Developers" , Igor Mammedov , Andreas =?iso-8859-1?Q?F=E4rber?= , David Gibson On Thu, May 28, 2015 at 10:17:25PM -0700, Peter Crosthwaite wrote: > On Wed, May 20, 2015 at 10:02 PM, Bharata B Rao > wrote: > > 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 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; > > With droppage of this line, or update to commit msg: > > Reviewed-by: Peter Crosthwaite This patch with updated patch description is below: >>From 63d355f6b796858cb99758f6f91043826cba7617 Mon Sep 17 00:00:00 2001 From: Bharata B Rao Date: Thu, 21 May 2015 10:01:17 +0530 Subject: [PATCH v3 3/3] ppc: Move cpu_exec_init() call to realize function 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 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; -- 2.1.0