From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45013) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SX1wm-0000YU-Ds for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SX1wh-0005fI-Tb for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:11 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35583 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SX1wh-0005eO-ND for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:07 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 23 May 2012 05:07:48 +0200 Message-Id: <1337742502-28565-26-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 25/59] sun4m: Pass SPARCCPU to cpu_set_irq() 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?= Needed for cpu_kick_irq(). Signed-off-by: Andreas F=C3=A4rber --- hw/sun4m.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/sun4m.c b/hw/sun4m.c index a959261..e9b9d9b 100644 --- a/hw/sun4m.c +++ b/hw/sun4m.c @@ -262,7 +262,8 @@ static void cpu_kick_irq(CPUSPARCState *env) =20 static void cpu_set_irq(void *opaque, int irq, int level) { - CPUSPARCState *env =3D opaque; + SPARCCPU *cpu =3D opaque; + CPUSPARCState *env =3D &cpu->env; =20 if (level) { trace_sun4m_cpu_set_irq_raise(irq); @@ -828,7 +829,7 @@ static void cpu_devinit(const char *cpu_model, unsign= ed int id, qemu_register_reset(secondary_cpu_reset, cpu); env->halted =3D 1; } - *cpu_irqs =3D qemu_allocate_irqs(cpu_set_irq, env, MAX_PILS); + *cpu_irqs =3D qemu_allocate_irqs(cpu_set_irq, cpu, MAX_PILS); env->prom_addr =3D prom_addr; } =20 --=20 1.7.7