From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45020) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SX1wm-0000ZL-NK for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SX1wd-0005b9-83 for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:12 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35568 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SX1wd-0005Zv-0V for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:03 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id F25EF9735A for ; Wed, 23 May 2012 05:09:01 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 23 May 2012 05:07:36 +0200 Message-Id: <1337742502-28565-14-git-send-email-afaerber@suse.de> In-Reply-To: <1337742502-28565-1-git-send-email-afaerber@suse.de> References: <1337742502-28565-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 qom-next 13/59] ppce500_spin: Store PowerPCCPU in SpinKick List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Needed for moving stop field to CPUState. Signed-off-by: Andreas F=C3=A4rber --- hw/ppce500_spin.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/ppce500_spin.c b/hw/ppce500_spin.c index fddf219..4c4a456 100644 --- a/hw/ppce500_spin.c +++ b/hw/ppce500_spin.c @@ -49,7 +49,7 @@ typedef struct spin_state { } SpinState; =20 typedef struct spin_kick { - CPUPPCState *env; + PowerPCCPU *cpu; SpinInfo *spin; } SpinKick; =20 @@ -92,7 +92,7 @@ static void mmubooke_create_initial_mapping(CPUPPCState= *env, static void spin_kick(void *data) { SpinKick *kick =3D data; - CPUPPCState *env =3D kick->env; + CPUPPCState *env =3D &kick->cpu->env; SpinInfo *curspin =3D kick->spin; target_phys_addr_t map_size =3D 64 * 1024 * 1024; target_phys_addr_t map_start; @@ -158,7 +158,7 @@ static void spin_write(void *opaque, target_phys_addr= _t addr, uint64_t value, if (!(ldq_p(&curspin->addr) & 1)) { /* run CPU */ SpinKick kick =3D { - .env =3D env, + .cpu =3D ppc_env_get_cpu(env), .spin =3D curspin, }; =20 --=20 1.7.7