From: kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Date: Wed, 28 Jun 2006 09:02:27 +0000 (+0100)
Subject: [HVM][SVM] Disable machine check bits in CPUID_1.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15913^2~8
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=948d53a5dd69058ced0785efa4f4d0528f0dc685;p=xen.git

[HVM][SVM] Disable machine check bits in CPUID_1.

Signed-off-by: Tom Woller <thomas.woller@amd.com>
---

diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c
index f988de00ad..3a90a27f0d 100644
--- a/xen/arch/x86/hvm/svm/svm.c
+++ b/xen/arch/x86/hvm/svm/svm.c
@@ -996,6 +996,10 @@ static void svm_vmexit_do_cpuid(struct vmcb_struct *vmcb, unsigned long input,
 	clear_bit(X86_FEATURE_HT, &edx);  /* clear the hyperthread bit */
 	ebx &= 0xFF00FFFF;  /* clear the logical processor count when HTT=0 */
 	ebx |= 0x00010000;  /* set to 1 just for precaution */
+
+	/* Disable machine check architecture */
+	clear_bit(X86_FEATURE_MCA, &edx);
+	clear_bit(X86_FEATURE_MCE, &edx);
     }
     else if ( ( input > 0x00000005 ) && ( input < 0x80000000 ) )
     {