[Xen-changelog] [xen-4.0-testing] vmx, tboot: Check the correct in/outside-SMX flag when init'ing VMX.

["Xen patchbot-4.0-testing" <patchbot-4.0-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1273481134 -3600
# Node ID ca9a5b6f1c203873437820e219684015f82f67bd
# Parent  fa75639b224aeb600b60e13ec699b643dd177475
vmx, tboot: Check the correct in/outside-SMX flag when init'ing VMX.

Signed-off-by: Shane Wang <shane.wang@xxxxxxxxx>
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
xen-unstable changeset:   21266:6d21da6feb59
xen-unstable date:        Tue May 04 12:29:05 2010 +0100
---
 xen/arch/x86/hvm/vmx/vmcs.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff -r fa75639b224a -r ca9a5b6f1c20 xen/arch/x86/hvm/vmx/vmcs.c
--- a/xen/arch/x86/hvm/vmx/vmcs.c       Mon May 10 09:45:08 2010 +0100
+++ b/xen/arch/x86/hvm/vmx/vmcs.c       Mon May 10 09:45:34 2010 +0100
@@ -360,8 +360,9 @@ int vmx_cpu_up(void)
     bios_locked = !!(eax & IA32_FEATURE_CONTROL_MSR_LOCK);
     if ( bios_locked )
     {
-        if ( !(eax & (IA32_FEATURE_CONTROL_MSR_ENABLE_VMXON_OUTSIDE_SMX |
-                      IA32_FEATURE_CONTROL_MSR_ENABLE_VMXON_INSIDE_SMX)) )
+        if ( !(eax & (tboot_in_measured_env()
+                      ? IA32_FEATURE_CONTROL_MSR_ENABLE_VMXON_INSIDE_SMX
+                      : IA32_FEATURE_CONTROL_MSR_ENABLE_VMXON_OUTSIDE_SMX)) )
         {
             printk("CPU%d: VMX disabled by BIOS.\n", cpu);
             return 0;

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