From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=39815 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PyRvj-0004KH-F4 for qemu-devel@nongnu.org; Sat, 12 Mar 2011 11:44:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PyRvh-0003yE-L1 for qemu-devel@nongnu.org; Sat, 12 Mar 2011 11:44:39 -0500 Received: from mail-ww0-f53.google.com ([74.125.82.53]:55933) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PyRvh-0003ur-FU for qemu-devel@nongnu.org; Sat, 12 Mar 2011 11:44:37 -0500 Received: by mail-ww0-f53.google.com with SMTP id 40so4591947wwj.10 for ; Sat, 12 Mar 2011 08:44:37 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Sat, 12 Mar 2011 17:43:57 +0100 Message-Id: <1299948248-30206-11-git-send-email-pbonzini@redhat.com> In-Reply-To: <1299948248-30206-1-git-send-email-pbonzini@redhat.com> References: <1299948248-30206-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v4 upstream 10/21] always qemu_cpu_kick after unhalting a cpu List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com 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 --- hw/ppc.c | 2 ++ hw/sun4m.c | 10 ++++++++-- hw/sun4u.c | 4 ++-- target-s390x/kvm.c | 1 + 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/hw/ppc.c b/hw/ppc.c index 968aec1..de02d33 100644 --- a/hw/ppc.c +++ b/hw/ppc.c @@ -208,6 +208,7 @@ static void ppc970_set_irq (void *opaque, int pin, int level) } else { LOG_IRQ("%s: restart the CPU\n", __func__); env->halted = 0; + qemu_cpu_kick(env); } break; case PPC970_INPUT_HRESET: @@ -300,6 +301,7 @@ static void ppc40x_set_irq (void *opaque, int pin, int level) } else { LOG_IRQ("%s: restart the CPU\n", __func__); env->halted = 0; + qemu_cpu_kick(env); } break; case PPC40x_INPUT_DEBUG: diff --git a/hw/sun4m.c b/hw/sun4m.c index 30e8a21..df3aa32 100644 --- a/hw/sun4m.c +++ b/hw/sun4m.c @@ -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); 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); diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index b349812..6e94274 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -194,6 +194,7 @@ static void kvm_s390_interrupt_internal(CPUState *env, int type, uint32_t parm, env->halted = 0; env->exception_index = -1; + qemu_cpu_kick(env); kvmint.type = type; kvmint.parm = parm; -- 1.7.4