From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Christoph Egger" <Christoph.Egger@amd.com>
Subject: [PATCH][HVM][SVM] Fix machine check intercept correctly
Date: Mon, 1 Oct 2007 17:33:13 +0200
Message-ID: <200710011733.13803.Christoph.Egger@amd.com>
Mime-Version: 1.0
Content-Type: multipart/mixed;
 boundary="Boundary-00=_5MRAHRcntu2BhHk"
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org


--Boundary-00=_5MRAHRcntu2BhHk
Content-Type: text/plain;
 charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline


Hi!

Attached patch fixes machine check interception
for HVM guests.

Keir: Please apply this patch to xen-staging *and* to Xen 3.1.1

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>


=2D-=20
AMD Saxony, Dresden, Germany
Operating System Research Center

Legal Information:
AMD Saxony Limited Liability Company & Co. KG
Sitz (Gesch=E4ftsanschrift):
   Wilschdorfer Landstr. 101, 01109 Dresden, Deutschland
Registergericht Dresden: HRA 4896
vertretungsberechtigter Komplement=E4r:
   AMD Saxony LLC (Sitz Wilmington, Delaware, USA)
Gesch=E4ftsf=FChrer der AMD Saxony LLC:
   Dr. Hans-R. Deppe, Thomas McCoy

--Boundary-00=_5MRAHRcntu2BhHk
Content-Type: text/plain;
 charset=us-ascii;
 name=xen_svm_mc.diff
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename=xen_svm_mc.diff

diff -r 5c7afb32df99 xen/arch/x86/hvm/svm/svm.c
--- a/xen/arch/x86/hvm/svm/svm.c	Mon Oct 01 06:39:00 2007 +0100
+++ b/xen/arch/x86/hvm/svm/svm.c	Mon Oct 01 15:29:14 2007 +0200
@@ -2166,7 +2166,6 @@ asmlinkage void svm_vmexit_handler(struc
 
     case VMEXIT_EXCEPTION_MC:
         HVMTRACE_0D(MCE, v);
-        do_machine_check(regs);
         break;
 
     case VMEXIT_VINTR:
diff -r 5c7afb32df99 xen/arch/x86/hvm/svm/vmcb.c
--- a/xen/arch/x86/hvm/svm/vmcb.c	Mon Oct 01 06:39:00 2007 +0100
+++ b/xen/arch/x86/hvm/svm/vmcb.c	Wed Sep 26 13:32:24 2007 +0200
@@ -252,6 +252,7 @@ static int construct_vmcb(struct vcpu *v
     {
         vmcb->exception_intercepts = HVM_TRAP_MASK | (1U << TRAP_page_fault);
     }
+    vmcb->exception_intercepts |= 1U << TRAP_machine_check;
 
     return 0;
 }

--Boundary-00=_5MRAHRcntu2BhHk
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

--Boundary-00=_5MRAHRcntu2BhHk--