diff options
author | Gleb Natapov <gleb@redhat.com> | 2009-03-23 06:12:11 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-06-10 04:48:33 -0400 |
commit | 78646121e9a2fcf7977cc15966420e572a450bc3 (patch) | |
tree | 55aeac260f4a43bef8e1bc1147f93a3f7e867ec7 /arch/x86/kvm/x86.c | |
parent | 09cec754885f900f6aab23801878c0cd217ee1d6 (diff) |
KVM: Fix interrupt unhalting a vcpu when it shouldn't
kvm_vcpu_block() unhalts vpu on an interrupt/timer without checking
if interrupt window is actually opened.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
-rw-r--r-- | arch/x86/kvm/x86.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 8fca7a4e95a3..5bbcad345376 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
@@ -4475,3 +4475,8 @@ void kvm_vcpu_kick(struct kvm_vcpu *vcpu) | |||
4475 | smp_call_function_single(ipi_pcpu, vcpu_kick_intr, vcpu, 0); | 4475 | smp_call_function_single(ipi_pcpu, vcpu_kick_intr, vcpu, 0); |
4476 | put_cpu(); | 4476 | put_cpu(); |
4477 | } | 4477 | } |
4478 | |||
4479 | int kvm_arch_interrupt_allowed(struct kvm_vcpu *vcpu) | ||
4480 | { | ||
4481 | return kvm_x86_ops->interrupt_allowed(vcpu); | ||
4482 | } | ||