summaryrefslogtreecommitdiff
path: root/arch/x86/kvm/x86.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2016-12-19 13:29:03 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2017-02-15 14:54:34 +0100
commit3d92789f69162ee5689f3766e5f50bb46b7e1d97 (patch)
treec9204e83b1c7ebbbba845e0e3417fdd7314ff318 /arch/x86/kvm/x86.c
parent810e6defcca4d05275aa15c2872c0a4949178fcb (diff)
downloadlwn-3d92789f69162ee5689f3766e5f50bb46b7e1d97.tar.gz
lwn-3d92789f69162ee5689f3766e5f50bb46b7e1d97.zip
KVM: vmx: move sync_pir_to_irr from apic_find_highest_irr to callers
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
-rw-r--r--arch/x86/kvm/x86.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 204793f0f0e2..8f80da161e80 100644
--- 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) {