diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2022-12-28 06:26:36 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-12-28 07:19:14 -0500 |
| commit | a5496886eb130ea08b1a5cd5c284543909bde749 (patch) | |
| tree | 6d0508cafff254dfe3974786f0d664d255835733 /arch/x86/kvm/irq_comm.c | |
| parent | 1b929c02afd37871d5afb9d498426f83432e71c2 (diff) | |
| parent | 129c48cde6c9e519d033305649665427c6cac494 (diff) | |
Merge branch 'kvm-late-6.1-fixes' into HEAD
x86:
* several fixes to nested VMX execution controls
* fixes and clarification to the documentation for Xen emulation
* do not unnecessarily release a pmu event with zero period
* MMU fixes
* fix Coverity warning in kvm_hv_flush_tlb()
selftests:
* fixes for the ucall mechanism in selftests
* other fixes mostly related to compilation with clang
Diffstat (limited to 'arch/x86/kvm/irq_comm.c')
| -rw-r--r-- | arch/x86/kvm/irq_comm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kvm/irq_comm.c b/arch/x86/kvm/irq_comm.c index 0687162c4f22..3742d9adacfc 100644 --- a/arch/x86/kvm/irq_comm.c +++ b/arch/x86/kvm/irq_comm.c @@ -426,8 +426,9 @@ void kvm_scan_ioapic_routes(struct kvm_vcpu *vcpu, kvm_set_msi_irq(vcpu->kvm, entry, &irq); if (irq.trig_mode && - kvm_apic_match_dest(vcpu, NULL, APIC_DEST_NOSHORT, - irq.dest_id, irq.dest_mode)) + (kvm_apic_match_dest(vcpu, NULL, APIC_DEST_NOSHORT, + irq.dest_id, irq.dest_mode) || + kvm_apic_pending_eoi(vcpu, irq.vector))) __set_bit(irq.vector, ioapic_handled_vectors); } } |