Commit fa9726b0 authored by Gleb Natapov's avatar Gleb Natapov Committed by Avi Kivity

KVM: Do not allow interrupt injection from userspace if there is a pending event.

The exception will immediately close the interrupt window.
Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 3298b75c
...@@ -3105,8 +3105,9 @@ static void post_kvm_run_save(struct kvm_vcpu *vcpu, ...@@ -3105,8 +3105,9 @@ static void post_kvm_run_save(struct kvm_vcpu *vcpu,
kvm_run->ready_for_interrupt_injection = 1; kvm_run->ready_for_interrupt_injection = 1;
else else
kvm_run->ready_for_interrupt_injection = kvm_run->ready_for_interrupt_injection =
(kvm_arch_interrupt_allowed(vcpu) && kvm_arch_interrupt_allowed(vcpu) &&
!kvm_cpu_has_interrupt(vcpu)); !kvm_cpu_has_interrupt(vcpu) &&
!kvm_event_needs_reinjection(vcpu);
} }
static void vapic_enter(struct kvm_vcpu *vcpu) static void vapic_enter(struct kvm_vcpu *vcpu)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment