From: Joerg Roedel <joerg.roedel@amd.com>
Date: Wed, 9 Apr 2008 12:15:29 +0000 (+0200)
Subject: KVM: SVM: align shadow CR4.MCE with host
X-Git-Tag: v2.6.26-rc1~1028^2~27
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6394b6494c0a352a2db3ea3e891ba7aeea7c1441;p=linux-2.6-omap-h63xx.git

KVM: SVM: align shadow CR4.MCE with host

This patch aligns the host version of the CR4.MCE bit with the CR4 active in
the guest. This is necessary to get MCE exceptions when the guest is running.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
---

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index d7439ceb2ac..8af463b9152 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -878,9 +878,12 @@ set:
 
 static void svm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)
 {
+	unsigned long host_cr4_mce = read_cr4() & X86_CR4_MCE;
+
 	vcpu->arch.cr4 = cr4;
 	if (!npt_enabled)
 		cr4 |= X86_CR4_PAE;
+	cr4 |= host_cr4_mce;
 	to_svm(vcpu)->vmcb->save.cr4 = cr4;
 }