diff options
| author | Paolo Bonzini | 2015-07-30 10:32:16 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2015-10-01 15:06:26 +0200 |
| commit | 4ca7dd8ce4b24e18f94eed90e80c6eb80fb48c9a (patch) | |
| tree | fb8243091752aefe94cdb358f725c927ec71fe42 /arch/x86/kvm/x86.c | |
| parent | KVM: x86: introduce lapic_in_kernel (diff) | |
| download | kernel-qcow2-linux-4ca7dd8ce4b24e18f94eed90e80c6eb80fb48c9a.tar.gz kernel-qcow2-linux-4ca7dd8ce4b24e18f94eed90e80c6eb80fb48c9a.tar.xz kernel-qcow2-linux-4ca7dd8ce4b24e18f94eed90e80c6eb80fb48c9a.zip | |
KVM: x86: unify handling of interrupt window
The interrupt window is currently checked twice, once in vmx.c/svm.c and
once in dm_request_for_irq_injection. The only difference is the extra
check for kvm_arch_interrupt_allowed in dm_request_for_irq_injection,
and the different return value (EINTR/KVM_EXIT_INTR for vmx.c/svm.c vs.
0/KVM_EXIT_IRQ_WINDOW_OPEN for dm_request_for_irq_injection).
However, dm_request_for_irq_injection is basically dead code! Revive it
by removing the checks in vmx.c and svm.c's vmexit handlers, and
fixing the returned values for the dm_request_for_irq_injection case.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 88fb3bf2ae6d..28c98c8f9d1c 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -6469,8 +6469,8 @@ static int vcpu_run(struct kvm_vcpu *vcpu) kvm_inject_pending_timer_irqs(vcpu); if (dm_request_for_irq_injection(vcpu)) { - r = -EINTR; - vcpu->run->exit_reason = KVM_EXIT_INTR; + r = 0; + vcpu->run->exit_reason = KVM_EXIT_IRQ_WINDOW_OPEN; ++vcpu->stat.request_irq_exits; break; } |