KVM: vmx: move sync_pir_to_irr from apic_find_highest_irr to callers

[karo-tx-linux.git] / arch / x86 / kvm / x86.c

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 204793f0f0e2dc28ef8ffaaacae57dc0f5b7e0ac..8f80da161e800f3d69a315478f804e9ec5526001 100644 (file)
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -6822,9 +6822,11 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
                 * Update architecture specific hints for APIC
                 * virtual interrupt delivery.
                 */
-               if (vcpu->arch.apicv_active)
+               if (vcpu->arch.apicv_active) {
+                       kvm_x86_ops->sync_pir_to_irr(vcpu);
                        kvm_x86_ops->hwapic_irr_update(vcpu,
                                kvm_lapic_find_highest_irr(vcpu));
+               }
        }
 
        if (kvm_check_request(KVM_REQ_EVENT, vcpu) || req_int_win) {