Changeset 79149 in vbox

Timestamp:

Jun 14, 2019 9:51:25 AM (6 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Iron out return code when hmR0VmxEvaluatePendingEvent causes a VM-exit (NMI/ext. INT).

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (4 diffs)

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

@@ -10490 +10490 @@
  * @retval  VINF_SUCCESS if we can proceed with running the guest, interrupts
  *          have been disabled.
+ * @retval  VINF_VMX_VMEXIT if a nested-guest VM-exit occurs (e.g., while evaluating
+ *          pending events).
  * @retval  VINF_EM_RESET if a triple-fault occurs while injecting a
  *          double-fault into the guest.
@@ -10620 +10622 @@
      * preparing to run a nested-guest but performed a nested-guest VM-exit, we should bail.
      */
-    if (   rcStrict != VINF_SUCCESS
-        || (    pVmxTransient->fIsNestedGuest
-            && !CPUMIsGuestInVmxNonRootMode(&pVCpu->cpum.GstCtx)))
+    if (rcStrict != VINF_SUCCESS)
         return rcStrict;
+    if (   pVmxTransient->fIsNestedGuest
+        && !CPUMIsGuestInVmxNonRootMode(&pVCpu->cpum.GstCtx))
+        return VINF_VMX_VMEXIT;
+#else
+    Assert(rcStrict == VINF_SUCCESS);
 #endif
 
@@ -12630 +12635 @@
 #endif
 
-    if (rcStrict == VERR_EM_INTERPRETER)
-        rcStrict = VINF_EM_RAW_EMULATE_INSTR;
-    else if (rcStrict == VINF_EM_RESET)
-        rcStrict = VINF_EM_TRIPLE_FAULT;
+    int const rcLoop = VBOXSTRICTRC_VAL(rcStrict);
+    switch (rcLoop)
+    {
+        case VINF_VMX_VMEXIT:       rcStrict = VINF_SUCCESS;                break;
+        case VERR_EM_INTERPRETER:   rcStrict = VINF_EM_RAW_EMULATE_INSTR;   break;
+        case VINF_EM_RESET:         rcStrict = VINF_EM_TRIPLE_FAULT;        break;
+    }
 
     int rc2 = hmR0VmxExitToRing3(pVCpu, rcStrict);
@@ -15994 +16002 @@
             AssertRCReturn(rc, rc);
 
-            uint8_t const  uVector    = VMX_EXIT_INT_INFO_VECTOR(uExitIntInfo);
-            bool const     fIntercept = CPUMIsGuestVmxXcptInterceptSet(pVCpu, &pVCpu->cpum.GstCtx, uVector,
-                                                                       pVmxTransient->uExitIntErrorCode);
+            uint8_t const uVector    = VMX_EXIT_INT_INFO_VECTOR(uExitIntInfo);
+            bool const    fIntercept = CPUMIsGuestVmxXcptInterceptSet(pVCpu, &pVCpu->cpum.GstCtx, uVector,
+                                                                      pVmxTransient->uExitIntErrorCode);
             if (fIntercept)
             {