aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiaohe Lin <linmiaohe@huawei.com>2020-01-18 10:41:55 +0800
committerPaolo Bonzini <pbonzini@redhat.com>2020-01-27 19:59:44 +0100
commit767b839afa5d62ba9cf859f4e90fef3d4a1780b5 (patch)
tree555a743150a387011272f75041aba3835e57341d
parentKVM: x86: Protect pmu_intel.c from Spectre-v1/L1TF attacks (diff)
downloadlinux-dev-767b839afa5d62ba9cf859f4e90fef3d4a1780b5.tar.xz
linux-dev-767b839afa5d62ba9cf859f4e90fef3d4a1780b5.zip
KVM: x86: avoid clearing pending exception event twice
The exception pending event is cleared by kvm_clear_exception_queue(). We shouldn't clear it again. Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--arch/x86/kvm/x86.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 780224e76723..2b26400a3410 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -9355,7 +9355,6 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)
vcpu->arch.nmi_injected = false;
kvm_clear_interrupt_queue(vcpu);
kvm_clear_exception_queue(vcpu);
- vcpu->arch.exception.pending = false;
memset(vcpu->arch.db, 0, sizeof(vcpu->arch.db));
kvm_update_dr0123(vcpu);