[Xen-changelog] [xen-unstable] Nested VMX: Add VMXE bits in virtual CR4

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Eddie Dong <eddie.dong@xxxxxxxxx>
# Date 1307607849 -28800
# Node ID d0c382a6e255976a258e73e73a62d4bb4df91d3f
# Parent  4bc49e35e5a03a9485e2f6ecdb357c8f4a173aea
Nested VMX: Add VMXE bits in virtual CR4

Signed-off-by: Qing He <qing.he@xxxxxxxxx>
Signed-off-by: Eddie Dong <eddie.dong@xxxxxxxxx>
Signed-off-by: Tim Deegan <Tim.Deegan@xxxxxxxxxx>
Committed-by: Tim Deegan <Tim.Deegan@xxxxxxxxxx>
---


diff -r 4bc49e35e5a0 -r d0c382a6e255 xen/include/asm-x86/cpufeature.h
--- a/xen/include/asm-x86/cpufeature.h  Thu Jun 09 16:24:09 2011 +0800
+++ b/xen/include/asm-x86/cpufeature.h  Thu Jun 09 16:24:09 2011 +0800
@@ -222,6 +222,8 @@
 
 #define cpu_has_svm            boot_cpu_has(X86_FEATURE_SVM)
 
+#define cpu_has_vmx            boot_cpu_has(X86_FEATURE_VMXE)
+
 #endif /* __ASM_I386_CPUFEATURE_H */
 
 /* 
diff -r 4bc49e35e5a0 -r d0c382a6e255 xen/include/asm-x86/hvm/hvm.h
--- a/xen/include/asm-x86/hvm/hvm.h     Thu Jun 09 16:24:09 2011 +0800
+++ b/xen/include/asm-x86/hvm/hvm.h     Thu Jun 09 16:24:09 2011 +0800
@@ -325,6 +325,8 @@
         X86_CR4_MCE | X86_CR4_PGE | X86_CR4_PCE |       \
         X86_CR4_OSFXSR | X86_CR4_OSXMMEXCPT |           \
         (cpu_has_smep ? X86_CR4_SMEP : 0) |             \
+        ((nestedhvm_enabled((_v)->domain) && cpu_has_vmx)\
+                      ? X86_CR4_VMXE : 0)  |             \
         (xsave_enabled(_v) ? X86_CR4_OSXSAVE : 0))))
 
 /* These exceptions must always be intercepted. */

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