From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59977) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3VB-0000R8-EU for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SR3V9-0000gt-ME for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:00 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 6 May 2012 17:34:26 +0200 Message-Id: <1336318514-30906-27-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 26/74] ppc_oldworld: Pass PowerPCCPU to ppc_heathrow_reset() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , "open list:Old World" , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori , Alexander Graf Allows us to use cpu_reset() in place of cpu_state_reset(). Signed-off-by: Andreas F=C3=A4rber --- hw/ppc_oldworld.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c index ba8f3ad..f2c6908 100644 --- a/hw/ppc_oldworld.c +++ b/hw/ppc_oldworld.c @@ -67,9 +67,9 @@ static target_phys_addr_t round_page(target_phys_addr_t= addr) =20 static void ppc_heathrow_reset(void *opaque) { - CPUPPCState *env =3D opaque; + PowerPCCPU *cpu =3D opaque; =20 - cpu_state_reset(env); + cpu_reset(CPU(cpu)); } =20 static void ppc_heathrow_init (ram_addr_t ram_size, @@ -114,7 +114,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size, =20 /* Set time-base frequency to 16.6 Mhz */ cpu_ppc_tb_init(env, 16600000UL); - qemu_register_reset(ppc_heathrow_reset, env); + qemu_register_reset(ppc_heathrow_reset, cpu); } =20 /* allocate RAM */ --=20 1.7.7