Changeset 52573 in vbox

Timestamp:

Sep 2, 2014 4:16:48 PM (10 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Fix a wrong invalid-guest-state check with regards to EFER.LMA and LME.

Location:

trunk

Files:

• include/VBox/vmm/hm_vmx.h (modified) (1 diff)
• src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (1 diff)

trunk/include/VBox/vmm/hm_vmx.h

@@ -209 +209 @@
 /** VMCS' EFER MSR.LMA does not match the IA32e mode guest control. */
 #define VMX_IGS_EFER_LMA_GUEST_MODE_MISMATCH                    14
-/** VMCS' EFER MSR.LMA does not match CR0.PG of the guest when not using
- *  unrestricted guest. */
-#define VMX_IGS_EFER_LMA_PG_MISMATCH                            15
+/** VMCS' EFER MSR.LMA does not match EFER.LME of the guest when using paging
+ *  without unrestricted guest. */
+#define VMX_IGS_EFER_LMA_LME_MISMATCH                            15
 /** CS.Attr.P bit invalid. */
 #define VMX_IGS_CS_ATTR_P_INVALID                               16

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -9351 +9351 @@
                               VMX_IGS_EFER_LMA_GUEST_MODE_MISMATCH);
             HMVMX_CHECK_BREAK(   fUnrestrictedGuest
-                              || RT_BOOL(u64Val & MSR_K6_EFER_LMA) == RT_BOOL(u32GuestCR0 & X86_CR0_PG),
-                              VMX_IGS_EFER_LMA_PG_MISMATCH);
+                              || !(u32GuestCR0 & X86_CR0_PG)
+                              || RT_BOOL(u64Val & MSR_K6_EFER_LMA) == RT_BOOL(u64Val & MSR_K6_EFER_LME),
+                              VMX_IGS_EFER_LMA_LME_MISMATCH);
         }