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 <avi@qumranet.com>
This commit is contained in:
parent
e25e3ed56f
commit
ab6ef34b90
@ -2144,6 +2144,8 @@ static int __vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
|
||||
if (unlikely(r))
|
||||
goto out;
|
||||
|
||||
kvm_inject_pending_timer_irqs(vcpu);
|
||||
|
||||
preempt_disable();
|
||||
|
||||
kvm_x86_ops->prepare_guest_switch(vcpu);
|
||||
|
@ -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 &
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user