From ab6ef34b906546d85d92dbc3e0fb4e01cce05f62 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Tue, 16 Oct 2007 16:23:22 +0200 Subject: [PATCH] KVM: Move apic timer interrupt backlog processing to common code Beside the obvious goodness of making code more common, this prevents a livelock with the next patch which moves interrupt injection out of the critical section. Signed-off-by: Avi Kivity --- drivers/kvm/kvm_main.c | 2 ++ drivers/kvm/svm.c | 1 - drivers/kvm/vmx.c | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c index 5fd2864b781..4c96817929f 100644 --- a/drivers/kvm/kvm_main.c +++ b/drivers/kvm/kvm_main.c @@ -2144,6 +2144,8 @@ again: if (unlikely(r)) goto out; + kvm_inject_pending_timer_irqs(vcpu); + preempt_disable(); kvm_x86_ops->prepare_guest_switch(vcpu); diff --git a/drivers/kvm/svm.c b/drivers/kvm/svm.c index 7b21576b62b..ef068d2dddd 100644 --- a/drivers/kvm/svm.c +++ b/drivers/kvm/svm.c @@ -1355,7 +1355,6 @@ static void svm_intr_assist(struct kvm_vcpu *vcpu) struct vmcb *vmcb = svm->vmcb; int intr_vector = -1; - kvm_inject_pending_timer_irqs(vcpu); if ((vmcb->control.exit_int_info & SVM_EVTINJ_VALID) && ((vmcb->control.exit_int_info & SVM_EVTINJ_TYPE_MASK) == 0)) { intr_vector = vmcb->control.exit_int_info & diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c index 6955580bb69..9f77ddbeb02 100644 --- a/drivers/kvm/vmx.c +++ b/drivers/kvm/vmx.c @@ -2191,7 +2191,6 @@ static void vmx_intr_assist(struct kvm_vcpu *vcpu) int has_ext_irq, interrupt_window_open; int vector; - kvm_inject_pending_timer_irqs(vcpu); update_tpr_threshold(vcpu); has_ext_irq = kvm_cpu_has_interrupt(vcpu); -- 2.20.1