aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorGravatar Maxim Levitsky <mlevitsk@redhat.com> 2021-09-14 18:48:12 +0300
committerGravatar Paolo Bonzini <pbonzini@redhat.com> 2021-09-23 10:04:40 -0400
commitaee77e1169c1900fe4248dc186962e745b479d9e (patch)
tree023fe184d823358bcab99b15916f756cc8cc8678 /arch
parentkvm: x86: Add AMD PMU MSRs to msrs_to_save_all[] (diff)
downloadlinux-aee77e1169c1900fe4248dc186962e745b479d9e.tar.gz
linux-aee77e1169c1900fe4248dc186962e745b479d9e.tar.bz2
linux-aee77e1169c1900fe4248dc186962e745b479d9e.zip
KVM: x86: nSVM: restore int_vector in svm_clear_vintr
In svm_clear_vintr we try to restore the virtual interrupt injection that might be pending, but we fail to restore the interrupt vector. Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com> Message-Id: <20210914154825.104886-2-mlevitsk@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kvm/svm/svm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index 196bb3d22383..d674304d45a2 100644
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -1566,6 +1566,8 @@ static void svm_clear_vintr(struct vcpu_svm *svm)
svm->vmcb->control.int_ctl |= svm->nested.ctl.int_ctl &
V_IRQ_INJECTION_BITS_MASK;
+
+ svm->vmcb->control.int_vector = svm->nested.ctl.int_vector;
}
vmcb_mark_dirty(svm->vmcb, VMCB_INTR);