From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45032) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SX1wn-0000aM-2W for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SX1wi-0005fb-9i for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:12 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35585 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SX1wi-0005eo-4D for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:08 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 23 May 2012 05:07:49 +0200 Message-Id: <1337742502-28565-27-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 26/59] sun4m: Pass SPARCCPU to cpu_kick_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 qemu_cpu_kick(). Signed-off-by: Andreas F=C3=A4rber --- hw/sun4m.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/sun4m.c b/hw/sun4m.c index e9b9d9b..8846f93 100644 --- a/hw/sun4m.c +++ b/hw/sun4m.c @@ -253,8 +253,10 @@ void cpu_check_irqs(CPUSPARCState *env) } } =20 -static void cpu_kick_irq(CPUSPARCState *env) +static void cpu_kick_irq(SPARCCPU *cpu) { + CPUSPARCState *env =3D &cpu->env; + env->halted =3D 0; cpu_check_irqs(env); qemu_cpu_kick(env); @@ -268,7 +270,7 @@ static void cpu_set_irq(void *opaque, int irq, int le= vel) if (level) { trace_sun4m_cpu_set_irq_raise(irq); env->pil_in |=3D 1 << irq; - cpu_kick_irq(env); + cpu_kick_irq(cpu); } else { trace_sun4m_cpu_set_irq_lower(irq); env->pil_in &=3D ~(1 << irq); --=20 1.7.7