Changeset 87831 in vbox

Timestamp:

Feb 22, 2021 8:44:54 AM (4 years ago)

Author:

vboxsync

Message:

VMM: Some modification for r142732 to make it work with KVM nested guests as well

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAll.cpp (modified) (1 diff)
• VMMR0/HMVMXR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

@@ -13915 +13915 @@
                       /* nested hw.virt codes: */
                       || rcStrict == VINF_VMX_VMEXIT
+                      || rcStrict == VINF_VMX_INTERCEPT_NOT_ACTIVE
                       || rcStrict == VINF_VMX_MODIFIES_BEHAVIOR
                       || rcStrict == VINF_SVM_VMEXIT

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

@@ -9096 +9096 @@
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX
                 if (    fIsNestedGuest
-                    &&  CPUMIsGuestVmxPinCtlsSet(pCtx, VMX_PIN_CTLS_EXT_INT_EXIT)
-                    && !CPUMIsGuestVmxExitCtlsSet(pCtx, VMX_EXIT_CTLS_ACK_EXT_INT))
+                    &&  CPUMIsGuestVmxPinCtlsSet(pCtx, VMX_PIN_CTLS_EXT_INT_EXIT))
                 {
                     VBOXSTRICTRC rcStrict = IEMExecVmxVmexitExtInt(pVCpu, 0 /* uVector */, true /* fIntPending */);
-                    Assert(rcStrict != VINF_VMX_INTERCEPT_NOT_ACTIVE);
-                    return rcStrict;
+                    if (rcStrict != VINF_VMX_INTERCEPT_NOT_ACTIVE)
+                        return rcStrict;
                 }
 #endif