From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60071) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3VE-0000b2-H2 for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SR3VC-0000iX-48 for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:04 -0400 Received: from cantor2.suse.de ([195.135.220.15]:55311 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3VB-0000hm-Ts for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:02 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 6 May 2012 17:34:31 +0200 Message-Id: <1336318514-30906-32-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 31/74] virtex_ml507: 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 call cpu_reset() in place of cpu_state_reset(). Signed-off-by: Andreas F=C3=A4rber --- hw/virtex_ml507.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c index 0e223bd..cace86b 100644 --- a/hw/virtex_ml507.c +++ b/hw/virtex_ml507.c @@ -108,10 +108,11 @@ static PowerPCCPU *ppc440_init_xilinx(ram_addr_t *r= am_size, =20 static void main_cpu_reset(void *opaque) { - CPUPPCState *env =3D opaque; + PowerPCCPU *cpu =3D opaque; + CPUPPCState *env =3D &cpu->env; struct boot_info *bi =3D env->load_info; =20 - cpu_state_reset(env); + cpu_reset(CPU(cpu)); /* Linux Kernel Parameters (passing device tree): * r3: pointer to the fdt * r4: 0 @@ -206,7 +207,7 @@ static void virtex_init(ram_addr_t ram_size, =20 cpu =3D ppc440_init_xilinx(&ram_size, 1, cpu_model, 400000000); env =3D &cpu->env; - qemu_register_reset(main_cpu_reset, env); + qemu_register_reset(main_cpu_reset, cpu); =20 memory_region_init_ram(phys_ram, "ram", ram_size); vmstate_register_ram_global(phys_ram); --=20 1.7.7