diff options
| author | Marcelo Tosatti | 2015-02-02 18:26:08 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2015-02-02 18:36:25 +0100 |
| commit | f9339860384aaa104d85f59b75921941b39a45fc (patch) | |
| tree | d9ce4990dc0a00af09a581c2cf1ed7c66807663a /arch/x86/kvm/lapic.c | |
| parent | kvm: vmx: fix oops with explicit flexpriority=0 option (diff) | |
| download | kernel-qcow2-linux-f9339860384aaa104d85f59b75921941b39a45fc.tar.gz kernel-qcow2-linux-f9339860384aaa104d85f59b75921941b39a45fc.tar.xz kernel-qcow2-linux-f9339860384aaa104d85f59b75921941b39a45fc.zip | |
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: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/lapic.c')
| -rw-r--r-- | arch/x86/kvm/lapic.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 555956c3c473..3481e9eee8f4 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -1086,13 +1086,13 @@ 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)) - return true; - } + if (kvm_x86_ops->deliver_posted_interrupt) + bitmap = apic->regs + APIC_IRR; + + if (apic_test_vector(vec, bitmap)) + return true; } return false; } |