Commit 94ad5b00 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Blue Swirl
Browse files

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: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent eda48c34

hw/ppc.c

+2 −0
Original line number Diff line number Diff line
@@ -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:

hw/sun4m.c

+8 −2
Original line number Diff line number Diff line
@@ -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);

hw/sun4u.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

target-s390x/kvm.c

+1 −0
Original line number Diff line number Diff line
@@ -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;