From: Miaohe Lin <linmiaohe@huawei.com>
Date: Sat, 18 Jan 2020 02:41:55 +0000 (+0800)
Subject: KVM: x86: avoid clearing pending exception event twice
X-Git-Tag: microblaze-v5.7-rc1~120^2~42
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=767b839afa5d62ba9cf859f4e90fef3d4a1780b5;p=linux-2.6-microblaze.git

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>
---

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);