KVM: Call kvm_vcpu_kick() inside pic spinlock

d5ecfdd25 moved it out because back than it was impossible to
call it inside spinlock. This restriction no longer exists.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 1 insertions, 9 deletions

diff --git a/arch/x86/kvm/i8259.c b/arch/x86/kvm/i8259.c
index daf4606b0293..d27320c8d464 100644
--- a/arch/x86/kvm/i8259.c
+++ b/arch/x86/kvm/i8259.c
@@ -43,11 +43,9 @@ static void pic_unlock(struct kvm_pic *s)
 {
         struct kvm *kvm = s->kvm;
         unsigned acks = s->pending_acks;
-        bool wakeup = s->wakeup_needed;
         struct kvm_vcpu *vcpu;
 
         s->pending_acks = 0;
-        s->wakeup_needed = false;
 
         spin_unlock(&s->lock);
 
@@ -56,12 +54,6 @@ static void pic_unlock(struct kvm_pic *s)
                                      __ffs(acks));
                 acks &= acks - 1;
         }
-
-        if (wakeup) {
-                vcpu = s->kvm->bsp_vcpu;
-                if (vcpu)
-                        kvm_vcpu_kick(vcpu);
-        }
 }
 
 static void pic_clear_isr(struct kvm_kpic_state *s, int irq)
@@ -527,7 +519,7 @@ static void pic_irq_request(void *opaque, int level)
         s->output = level;
         if (vcpu && level && (s->pics[0].isr_ack & (1 << irq))) {
                 s->pics[0].isr_ack &= ~(1 << irq);
-                s->wakeup_needed = true;
+                kvm_vcpu_kick(vcpu);
         }
 }