Changeset 75767 in vbox for trunk/src/VBox/VMM/VMMR3/TRPM.cpp

Timestamp:

Nov 27, 2018 11:23:24 AM (6 years ago)

Author:

vboxsync

Message:

VMM/TRPM: Nested VMX: bugref:9180 Put the "acknowledge interrupt on exit" in the code-path that is not raw-mode.

File:

• trunk/src/VBox/VMM/VMMR3/TRPM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/TRPM.cpp

@@ -1519 +1519 @@
     if (RT_SUCCESS(rc))
     {
-#ifdef VBOX_WITH_NESTED_HWVIRT_VMX
-        /* Handle the "acknowledge interrupt on exit" VM-exit intercept. */
-        if (CPUMIsGuestInVmxNonRootMode(pCtx))
-        {
-            if (   CPUMIsGuestVmxExitCtlsSet(pVCpu, pCtx, VMX_EXIT_CTLS_ACK_EXT_INT)
-                && CPUMIsGuestVmxPinCtlsSet(pVCpu, pCtx, VMX_PIN_CTLS_EXT_INT_EXIT))
-            {
-                VBOXSTRICTRC rcStrict = IEMExecVmxVmexitExtInt(pVCpu, u8Interrupt, false /* fIntPending */);
-                Assert(rcStrict != VINF_PGM_CHANGE_MODE);
-                if (rcStrict != VINF_VMX_INTERCEPT_NOT_ACTIVE)
-                    return VBOXSTRICTRC_TODO(rcStrict);
-            }
-        }
-#endif
         if (EMIsSupervisorCodeRecompiled(pVM) || !VM_IS_RAW_MODE_ENABLED(pVM))
         {
@@ -1602 +1588 @@
     if (RT_SUCCESS(rc))
     {
+#ifdef VBOX_WITH_NESTED_HWVIRT_VMX
+        /* Handle the "acknowledge interrupt on exit" VM-exit intercept. */
+        if (CPUMIsGuestInVmxNonRootMode(pCtx))
+        {
+            if (   CPUMIsGuestVmxExitCtlsSet(pVCpu, pCtx, VMX_EXIT_CTLS_ACK_EXT_INT)
+                && CPUMIsGuestVmxPinCtlsSet(pVCpu, pCtx, VMX_PIN_CTLS_EXT_INT_EXIT))
+            {
+                VBOXSTRICTRC rcStrict = IEMExecVmxVmexitExtInt(pVCpu, u8Interrupt, false /* fIntPending */);
+                Assert(rcStrict != VINF_PGM_CHANGE_MODE);
+                if (rcStrict != VINF_VMX_INTERCEPT_NOT_ACTIVE)
+                    return VBOXSTRICTRC_TODO(rcStrict);
+            }
+        }
+#endif
         if (!VM_IS_NEM_ENABLED(pVM))
         {