From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arun Sharma <arun.sharma@intel.com>
Subject: [PATCH] vmx-smsw.patch
Date: Fri, 27 May 2005 12:40:18 -0700
Message-ID: <20050527194018.GA13844@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
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: Ian Pratt <Ian.Pratt@cl.cam.ac.uk>, Keir Fraser <Keir.Fraser@cl.cam.ac.uk>
Cc: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

Handle vmexits from the SMSW instruction correctly.

Signed-off-by: Arun Sharma <arun.sharma@intel.com>

--- 1.58/xen/arch/x86/vmx.c	2005-05-26 19:36:15 -07:00
+++ edited/xen/arch/x86/vmx.c	2005-05-27 12:27:13 -07:00
@@ -987,10 +986,9 @@
         __vmwrite(CR0_READ_SHADOW, value);
         break;
     case TYPE_LMSW:
-        __vmwrite(CR0_READ_SHADOW, value);
+        __vmread(CR0_READ_SHADOW, &value);
 	value = (value & ~0xF) |
-		(((exit_qualification & LMSW_SOURCE_DATA) >> 16) & 0xF) |
-		1 /* CR0.PE == 1 */;
+		(((exit_qualification & LMSW_SOURCE_DATA) >> 16) & 0xF);
 	return vmx_set_cr0(value);
         break;
     default: