Changeset 74121 in vbox for trunk

Timestamp:

Sep 6, 2018 2:57:41 PM (6 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Fixed a minor bug in VM-entry failure detection.

Location:

trunk

Files:

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

trunk/include/VBox/vmm/hm_vmx.h

@@ -2215 +2215 @@
  */
 #define VMX_EXIT_REASON_BASIC(a)                                ((a) & 0xffff)
+#define VMX_EXIT_REASON_HAS_ENTRY_FAILED(a)                     (((a) >> 31) & 1)
 /** @} */
 

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

@@ -8864 +8864 @@
     rc     |= hmR0VmxReadEntryIntInfoVmcs(pVmxTransient);
     AssertRC(rc);
-    pVmxTransient->uExitReason    = (uint16_t)VMX_EXIT_REASON_BASIC(uExitReason);
-    pVmxTransient->fVMEntryFailed = VMX_ENTRY_INT_INFO_IS_VALID(pVmxTransient->uEntryIntInfo);
+    pVmxTransient->uExitReason    = VMX_EXIT_REASON_BASIC(uExitReason);
+    pVmxTransient->fVMEntryFailed = VMX_EXIT_REASON_HAS_ENTRY_FAILED(uExitReason);
 
     if (rcVMRun == VINF_SUCCESS)
@@ -8923 +8923 @@
             }
 
+            Assert(VMMRZCallRing3IsEnabled(pVCpu));
             return;
         }