From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50150) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCFac-00054o-Qb for qemu-devel@nongnu.org; Mon, 06 Jul 2015 19:14:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZCFab-0007dJ-FF for qemu-devel@nongnu.org; Mon, 06 Jul 2015 19:14:18 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 7 Jul 2015 01:13:49 +0200 Message-Id: <1436224445-19449-7-git-send-email-afaerber@suse.de> In-Reply-To: <1436224445-19449-1-git-send-email-afaerber@suse.de> References: <1436224445-19449-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 06/22] target-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: Alexander Graf , Peter Crosthwaite , "open list:PowerPC" , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Bharata B Rao 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 Signed-off-by: Andreas F=C3=A4rber --- 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, Er= ror **errp) return; } =20 + cpu_exec_init(&cpu->env, &local_err); + if (local_err !=3D NULL) { + error_propagate(errp, local_err); + return; + } cpu->cpu_dt_id =3D (cs->cpu_index / smp_threads) * max_smt + (cs->cpu_index % smp_threads); #endif @@ -9141,6 +9146,8 @@ static void ppc_cpu_unrealizefn(DeviceState *dev, E= rror **errp) opc_handler_t **table; int i, j; =20 + cpu_exec_exit(CPU(dev)); + for (i =3D 0; i < PPC_CPU_OPCODES_LEN; i++) { if (env->opcodes[i] =3D=3D &invalid_handler) { continue; @@ -9633,8 +9640,6 @@ static void ppc_cpu_initfn(Object *obj) CPUPPCState *env =3D &cpu->env; =20 cs->env_ptr =3D env; - cpu_exec_init(env, &error_abort); - cpu->cpu_dt_id =3D cs->cpu_index; =20 env->msr_mask =3D pcc->msr_mask; env->mmu_model =3D pcc->mmu_model; --=20 2.1.4