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/ia64 | |
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/ia64')
-rw-r--r-- | arch/ia64/kvm/kvm-ia64.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c index d2a90fd505b0..3bf0a345224a 100644 --- a/arch/ia64/kvm/kvm-ia64.c +++ b/arch/ia64/kvm/kvm-ia64.c | |||
@@ -1963,6 +1963,12 @@ int kvm_cpu_has_interrupt(struct kvm_vcpu *vcpu) | |||
1963 | return 0; | 1963 | return 0; |
1964 | } | 1964 | } |
1965 | 1965 | ||
1966 | int kvm_arch_interrupt_allowed(struct kvm_vcpu *vcpu) | ||
1967 | { | ||
1968 | /* do real check here */ | ||
1969 | return 1; | ||
1970 | } | ||
1971 | |||
1966 | int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu) | 1972 | int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu) |
1967 | { | 1973 | { |
1968 | return vcpu->arch.timer_fired; | 1974 | return vcpu->arch.timer_fired; |