From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59887) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3V7-0000FT-MH for qemu-devel@nongnu.org; Sun, 06 May 2012 11:35:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SR3V6-0000fB-1Z for qemu-devel@nongnu.org; Sun, 06 May 2012 11:35:57 -0400 Received: from cantor2.suse.de ([195.135.220.15]:55268 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3V5-0000ei-Ru for qemu-devel@nongnu.org; Sun, 06 May 2012 11:35:55 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 6 May 2012 17:34:20 +0200 Message-Id: <1336318514-30906-21-git-send-email-afaerber@suse.de> In-Reply-To: <1336318514-30906-1-git-send-email-afaerber@suse.de> References: <1336318514-30906-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] [PATCH for-next 20/74] ppc440_bamboo: Pass PowerPCCPU to main_cpu_reset() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori Allows us to use cpu_reset() in place of cpu_state_reset(). Signed-off-by: Andreas F=C3=A4rber --- hw/ppc440_bamboo.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c index 1a4e66a..0dd4dab 100644 --- a/hw/ppc440_bamboo.c +++ b/hw/ppc440_bamboo.c @@ -145,9 +145,10 @@ static void mmubooke_create_initial_mapping(CPUPPCSt= ate *env, =20 static void main_cpu_reset(void *opaque) { - CPUPPCState *env =3D opaque; + PowerPCCPU *cpu =3D opaque; + CPUPPCState *env =3D &cpu->env; =20 - cpu_state_reset(env); + cpu_reset(CPU(cpu)); env->gpr[1] =3D (16<<20) - 8; env->gpr[3] =3D FDT_ADDR; env->nip =3D entry; @@ -193,7 +194,7 @@ static void bamboo_init(ram_addr_t ram_size, } env =3D &cpu->env; =20 - qemu_register_reset(main_cpu_reset, env); + qemu_register_reset(main_cpu_reset, cpu); ppc_booke_timers_init(env, 400000000, 0); ppc_dcr_init(env, NULL, NULL); =20 --=20 1.7.7