Commit f9339860 authored by Marcelo Tosatti's avatar Marcelo Tosatti Committed by Paolo Bonzini
Browse files

KVM: x86: fix lapic_timer_int_injected with APIC-v 



With APICv, LAPIC timer interrupt is always delivered via IRR:
apic_find_highest_irr syncs PIR to IRR.

Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent ad15a296

arch/x86/kvm/lapic.c

+6 −6
Original line number Diff line number Diff line
@@ -1086,14 +1086,14 @@ static bool lapic_timer_int_injected(struct kvm_vcpu *vcpu) 


	if (kvm_apic_hw_enabled(apic)) {

		int vec = reg & APIC_VECTOR_MASK;

		void *bitmap = apic->regs + APIC_ISR;



		if (kvm_x86_ops->test_posted_interrupt)

			return kvm_x86_ops->test_posted_interrupt(vcpu, vec);

		else {

			if (apic_test_vector(vec, apic->regs + APIC_ISR))

		if (kvm_x86_ops->deliver_posted_interrupt)

			bitmap = apic->regs + APIC_IRR;



		if (apic_test_vector(vec, bitmap))

			return true;

	}

	}

	return false;

}