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
> <bhar...@linux.vnet.ibm.com> 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 <bhar...@linux.vnet.ibm.com>
> > Reviewed-by: David Gibson <da...@gibson.dropbear.id.au>
> > ---
> > 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 <peter.crosthwa...@xilinx.com>
This patch with updated patch description is below:
>From 63d355f6b796858cb99758f6f91043826cba7617 Mon Sep 17 00:00:00 2001
From: Bharata B Rao <bhar...@linux.vnet.ibm.com>
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 <bhar...@linux.vnet.ibm.com>
Reviewed-by: David Gibson <da...@gibson.dropbear.id.au>
Peter Crosthwaite <peter.crosthwa...@xilinx.com>
---
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
