From: Zhang Xiantao <xiantao.zhang@intel.com>
Date: Fri, 24 Aug 2012 08:49:14 +0000 (+0100)
Subject: nested vmx: VM_ENTRY_IA32E_MODE shouldn't be in default1 class
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~8024
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4875b06f1a162c3ee0aacc17a80801603a1c5d24;p=xen.git

nested vmx: VM_ENTRY_IA32E_MODE shouldn't be in default1 class
for IA32_VM_ENTRY_CTLS_MSR.

If set to 1, L2 guest's paging mode maybe mis-judged
and mis-set.

Signed-off-by: Zhang Xiantao <xiantao.zhang@intel.com>
Committed-by: Keir Fraser <keir@xen.org>
---

diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c
index fc733a9dbb..2e0b79dc2d 100644
--- a/xen/arch/x86/hvm/vmx/vvmx.c
+++ b/xen/arch/x86/hvm/vmx/vvmx.c
@@ -1334,7 +1334,6 @@ int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content)
     case MSR_IA32_VMX_ENTRY_CTLS:
         /* bit 0-8, and 12 must be 1 (refer G5 of SDM) */
         data = 0x11ff;
-        data |= VM_ENTRY_IA32E_MODE;
         data = (data << 32) | data;
         break;