aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGleb Natapov <gleb@redhat.com>2009-08-04 15:30:27 +0300
committerAvi Kivity <avi@redhat.com>2009-09-10 08:33:21 +0300
commit956f97cf665dc8c8ce2d5138bb38c022673b12d7 (patch)
tree0d907c09659b8bd9226e3024996e15b3ea9a2bd0 /arch
parent3a34a8810b2ed316bfe58fa53640e8d30de3f6c2 (diff)
downloadmrst-s0i3-test-956f97cf665dc8c8ce2d5138bb38c022673b12d7.tar.gz
mrst-s0i3-test-956f97cf665dc8c8ce2d5138bb38c022673b12d7.tar.xz
mrst-s0i3-test-956f97cf665dc8c8ce2d5138bb38c022673b12d7.zip
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kvm/i8259.c10
-rw-r--r--arch/x86/kvm/irq.h1
2 files changed, 1 insertions, 10 deletions
diff --git a/arch/x86/kvm/i8259.c b/arch/x86/kvm/i8259.c
index daf4606b029..d27320c8d46 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);
}
}
diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h
index 9f593188129..7d6058a2fd3 100644
--- a/arch/x86/kvm/irq.h
+++ b/arch/x86/kvm/irq.h
@@ -63,7 +63,6 @@ struct kvm_kpic_state {
struct kvm_pic {
spinlock_t lock;
- bool wakeup_needed;
unsigned pending_acks;
struct kvm *kvm;
struct kvm_kpic_state pics[2]; /* 0 is master pic, 1 is slave pic */