From d6a1d4ea1652e923e3df098ce78ba59dd3e31f8c Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joerg.roedel@amd.com>
Date: Wed, 9 Apr 2008 14:15:29 +0200
Subject: [PATCH] --- yaml --- r: 93885 b: refs/heads/master c:
 6394b6494c0a352a2db3ea3e891ba7aeea7c1441 h: refs/heads/master i:   93883:
 38f6a283e4e8b407c071e7676436fac8c0d843a2 v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/svm.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4ad8eb82b000..d500c2c6aca6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec077263b2bb841d973d82342b7fbc07bbad4246
+refs/heads/master: 6394b6494c0a352a2db3ea3e891ba7aeea7c1441
diff --git a/trunk/arch/x86/kvm/svm.c b/trunk/arch/x86/kvm/svm.c
index d7439ceb2ac2..8af463b91526 100644
--- a/trunk/arch/x86/kvm/svm.c
+++ b/trunk/arch/x86/kvm/svm.c
@@ -878,9 +878,12 @@ static void svm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)
 
 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;
 }