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/sun4m.c | |
parent | eda48c344f35e5bd511dea3e8be56fb08c19b399 (diff) | |
download | hqemu-94ad5b00a31113ed36b9d03a8db16de5535e90c4.zip hqemu-94ad5b00a31113ed36b9d03a8db16de5535e90c4.tar.gz |
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/sun4m.c')
-rw-r--r-- | hw/sun4m.c | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -253,15 +253,21 @@ void cpu_check_irqs(CPUState *env) } } +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) { CPUState *env = opaque; if (level) { trace_sun4m_cpu_set_irq_raise(irq); - env->halted = 0; env->pil_in |= 1 << irq; - cpu_check_irqs(env); + cpu_kick_irq(env); } else { trace_sun4m_cpu_set_irq_lower(irq); env->pil_in &= ~(1 << irq); |