From 94ad5b00a31113ed36b9d03a8db16de5535e90c4 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Sat, 12 Mar 2011 17:43:57 +0100 Subject: always qemu_cpu_kick after unhalting a cpu This ensures env->halt_cond is broadcast, and the loop in qemu_tcg_wait_io_event and qemu_kvm_wait_io_event is exited naturally rather than through a timeout. Signed-off-by: Paolo Bonzini Signed-off-by: Blue Swirl --- hw/sun4u.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'hw/sun4u.c') diff --git a/hw/sun4u.c b/hw/sun4u.c index 90b1ce2..d282324 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -298,6 +298,7 @@ static void cpu_kick_irq(CPUState *env) { env->halted = 0; cpu_check_irqs(env); + qemu_cpu_kick(env); } static void cpu_set_irq(void *opaque, int irq, int level) @@ -306,9 +307,8 @@ static void cpu_set_irq(void *opaque, int irq, int level) if (level) { CPUIRQ_DPRINTF("Raise CPU IRQ %d\n", irq); - env->halted = 0; env->pil_in |= 1 << irq; - cpu_check_irqs(env); + cpu_kick_irq(env); } else { CPUIRQ_DPRINTF("Lower CPU IRQ %d\n", irq); env->pil_in &= ~(1 << irq); -- cgit v1.1