From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45147) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SX1wq-0000jQ-7V for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SX1wj-0005gN-87 for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:15 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35591 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SX1wj-0005fT-24 for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:09 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 23 May 2012 05:07:51 +0200 Message-Id: <1337742502-28565-29-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 28/59] sun4u: 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/sun4u.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/sun4u.c b/hw/sun4u.c index 4cea102..0453522 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -310,8 +310,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); @@ -431,7 +433,7 @@ static void tick_irq(void *opaque) } =20 env->softint |=3D SOFTINT_TIMER; - cpu_kick_irq(env); + cpu_kick_irq(cpu); } =20 static void stick_irq(void *opaque) @@ -449,7 +451,7 @@ static void stick_irq(void *opaque) } =20 env->softint |=3D SOFTINT_STIMER; - cpu_kick_irq(env); + cpu_kick_irq(cpu); } =20 static void hstick_irq(void *opaque) @@ -467,7 +469,7 @@ static void hstick_irq(void *opaque) } =20 env->softint |=3D SOFTINT_STIMER; - cpu_kick_irq(env); + cpu_kick_irq(cpu); } =20 static int64_t cpu_to_timer_ticks(int64_t cpu_ticks, uint32_t frequency) --=20 1.7.7