Changeset 70356 in vbox

Timestamp:

Dec 27, 2017 9:06:57 AM (7 years ago)

Author:

vboxsync

Message:

VMM/HMSVMR0: When intercepting all exceptions (debug mode), don't triple-fault the outer guest if the nested-hypervisor is intercepting SHUTDOWN.

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (1 diff)

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

@@ -72 +72 @@
     { \
         int rc = hmR0SvmCheckExitDueToEventDelivery(pVCpu, pCtx, pSvmTransient); \
-        if (RT_LIKELY(rc == VINF_SUCCESS)) { /* likely */ } \
-        else if (rc == VINF_HM_DOUBLE_FAULT) \
-            return VINF_SUCCESS; \
+        if (RT_LIKELY(rc == VINF_SUCCESS))        { /* continue #VMEXIT handling */ } \
+        else if (     rc == VINF_HM_DOUBLE_FAULT) { return VINF_SUCCESS;            } \
+        else if (     rc == VINF_EM_RESET \
+                 &&   CPUMIsGuestSvmCtrlInterceptSet(pVCpu, pCtx, SVM_CTRL_INTERCEPT_SHUTDOWN)) \
+            return VBOXSTRICTRC_TODO(IEMExecSvmVmexit(pVCpu, SVM_EXIT_SHUTDOWN, 0, 0)); \
         else \
             return rc; \