From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50036) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSH2A-0000XZ-0X for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SSH26-0005HB-CU for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:05 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35528 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSH26-0005FT-46 for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:02 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 10 May 2012 02:13:47 +0200 Message-Id: <1336608892-30501-10-git-send-email-afaerber@suse.de> In-Reply-To: <1336608892-30501-1-git-send-email-afaerber@suse.de> References: <1336608892-30501-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 next v2 09/74] sun4m: Pass SPARCCPU to {main, secondary}_cpu_reset() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Blue Swirl , =?UTF-8?q?Andreas=20F=C3=A4rber?= We can now use cpu_reset() in place of cpu_state_reset(). Signed-off-by: Andreas F=C3=A4rber --- hw/sun4m.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/hw/sun4m.c b/hw/sun4m.c index c5d2e40..a959261 100644 --- a/hw/sun4m.c +++ b/hw/sun4m.c @@ -281,17 +281,19 @@ static void dummy_cpu_set_irq(void *opaque, int irq= , int level) =20 static void main_cpu_reset(void *opaque) { - CPUSPARCState *env =3D opaque; + SPARCCPU *cpu =3D opaque; + CPUSPARCState *env =3D &cpu->env; =20 - cpu_state_reset(env); + cpu_reset(CPU(cpu)); env->halted =3D 0; } =20 static void secondary_cpu_reset(void *opaque) { - CPUSPARCState *env =3D opaque; + SPARCCPU *cpu =3D opaque; + CPUSPARCState *env =3D &cpu->env; =20 - cpu_state_reset(env); + cpu_reset(CPU(cpu)); env->halted =3D 1; } =20 @@ -821,9 +823,9 @@ static void cpu_devinit(const char *cpu_model, unsign= ed int id, =20 cpu_sparc_set_id(env, id); if (id =3D=3D 0) { - qemu_register_reset(main_cpu_reset, env); + qemu_register_reset(main_cpu_reset, cpu); } else { - qemu_register_reset(secondary_cpu_reset, env); + qemu_register_reset(secondary_cpu_reset, cpu); env->halted =3D 1; } *cpu_irqs =3D qemu_allocate_irqs(cpu_set_irq, env, MAX_PILS); --=20 1.7.7