From: Peter Xu <peterx@redhat.com>
Date: Wed, 4 Dec 2019 19:07:16 +0000 (+0100)
Subject: KVM: X86: Fix kvm_bitmap_or_dest_vcpus() to use irq shorthand
X-Git-Tag: v5.5.8~19
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0eb2135e91839cb3199e44881e56e8b21bff8032;p=users%2Fdwmw2%2Flinux.git

KVM: X86: Fix kvm_bitmap_or_dest_vcpus() to use irq shorthand

commit b4b2963616bbd91ebb33148522552e1135de56ae upstream.

The 3rd parameter of kvm_apic_match_dest() is the irq shorthand,
rather than the irq delivery mode.

Fixes: 7ee30bc132c6 ("KVM: x86: deliver KVM IOAPIC scan request to target vCPUs")
Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index f05123acaa64c..a1daebe2a60f1 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -1150,7 +1150,7 @@ void kvm_bitmap_or_dest_vcpus(struct kvm *kvm, struct kvm_lapic_irq *irq,
 			if (!kvm_apic_present(vcpu))
 				continue;
 			if (!kvm_apic_match_dest(vcpu, NULL,
-						 irq->delivery_mode,
+						 irq->shorthand,
 						 irq->dest_id,
 						 irq->dest_mode))
 				continue;