[Xen-devel] [PATCH 19 of 20] Add VMXE bits in virtual CR4

[Eddie Dong <eddie.dong@xxxxxxxxx>]

# HG changeset patch
# User Eddie Dong <eddie.dong@xxxxxxxxx>
# Date 1307607849 -28800
# Node ID 3189a3e6f05ecc7e14bc55e944c48d7e50613a96
# Parent  187ed9f1603db8a09f465cc67a8febce716d4744
Add VMXE bits in virtual CR4

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

diff -r 187ed9f1603d -r 3189a3e6f05e 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
@@ -216,6 +216,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 187ed9f1603d -r 3189a3e6f05e 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
@@ -313,6 +313,7 @@ static inline int hvm_do_pmu_interrupt(s
         X86_CR4_DE  | X86_CR4_PSE | X86_CR4_PAE |       \
         X86_CR4_MCE | X86_CR4_PGE | X86_CR4_PCE |       \
         X86_CR4_OSFXSR | X86_CR4_OSXMMEXCPT |           \
+        (cpu_has_vmx ? X86_CR4_VMXE : 0)  |            \
         (xsave_enabled(_v) ? X86_CR4_OSXSAVE : 0))))
 
 /* These exceptions must always be intercepted. */

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