From: Nadav Amit <namit@cs.technion.ac.il>
Date: Thu, 2 Apr 2015 00:10:38 +0000 (+0300)
Subject: KVM: x86: Clear CR2 on VCPU reset
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1119022c71fb11826041787cf0ebffc1a1b0ba5b;p=openwrt%2Fstaging%2Fblogic.git

KVM: x86: Clear CR2 on VCPU reset

CR2 is not cleared as it should after reset.  See Intel SDM table named "IA-32
Processor States Following Power-up, Reset, or INIT".

Signed-off-by: Nadav Amit <namit@cs.technion.ac.il>
Message-Id: <1427933438-12782-5-git-send-email-namit@cs.technion.ac.il>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index ad3809df7d0a..faf044dba60c 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -7123,6 +7123,8 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu)
 	vcpu->arch.dr7 = DR7_FIXED_1;
 	kvm_update_dr7(vcpu);
 
+	vcpu->arch.cr2 = 0;
+
 	kvm_make_request(KVM_REQ_EVENT, vcpu);
 	vcpu->arch.apf.msr_val = 0;
 	vcpu->arch.st.msr_val = 0;