diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2011-03-12 17:43:57 +0100 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-03-13 14:44:21 +0000 |
| commit | 94ad5b00a31113ed36b9d03a8db16de5535e90c4 (patch) | |
| tree | 24705a74f7ba1964d98f8a9785300d66cd1829f6 /hw/sun4u.c | |
| parent | eda48c344f35e5bd511dea3e8be56fb08c19b399 (diff) | |
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 <pbonzini@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw/sun4u.c')
| -rw-r--r-- | hw/sun4u.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/sun4u.c b/hw/sun4u.c index 90b1ce2770..d28232426f 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); |