Changeset 75657 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Nov 22, 2018 6:58:18 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

126839

Message:

VMM/EM: Nested VMX: bugref:9180 Fix interrupt-window exiting.

File:

• trunk/src/VBox/VMM/VMMR3/EM.cpp (modified) (1 diff)

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

@@ -1775 +1775 @@
      *        VMCPU_FF_INTERRUPT_PIC here doesn't help as the caller already checks for
      *        it earlier as part of the high-priority pre-mask anyway. */
-    if (CPUMCanVmxNstGstTakePhysIntr(pVCpu, &pVCpu->cpum.GstCtx))
+    if (   VMCPU_FF_IS_ANY_SET(pVCpu, VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC)
+        && CPUMCanVmxNstGstTakePhysIntr(pVCpu, &pVCpu->cpum.GstCtx))
     {
         Assert(pVCpu->em.s.enmState != EMSTATE_WAIT_SIPI);
-        if (VMCPU_FF_IS_ANY_SET(pVCpu, VMCPU_FF_INTERRUPT_APIC | VMCPU_FF_INTERRUPT_PIC))
-        {
-            Assert(!VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS));
-            if (CPUMIsGuestVmxProcCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS_INT_WINDOW_EXIT))
+        Assert(!VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS));
+        if (CPUMIsGuestVmxProcCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS_INT_WINDOW_EXIT))
+        {
+            CPUM_IMPORT_EXTRN_RET(pVCpu, IEM_CPUMCTX_EXTRN_VMX_VMEXIT_MASK);
+            VBOXSTRICTRC rcStrict = IEMExecVmxVmexitIntWindow(pVCpu);
+            if (RT_SUCCESS(rcStrict))
             {
-                CPUM_IMPORT_EXTRN_RET(pVCpu, IEM_CPUMCTX_EXTRN_VMX_VMEXIT_MASK);
-                VBOXSTRICTRC rcStrict = IEMExecVmxVmexitIntWindow(pVCpu);
-                if (rcStrict != VINF_VMX_INTERCEPT_NOT_ACTIVE)
-                {
-                    *pfWakeupPending = true;
-                    if (RT_SUCCESS(rcStrict))
-                    {
-                        Assert(rcStrict != VINF_PGM_CHANGE_MODE);
-                        if (rcStrict == VINF_VMX_VMEXIT)
-                            return VINF_SUCCESS;
-                        return VBOXSTRICTRC_VAL(rcStrict);
-                    }
-                    AssertMsgFailed(("Interrupt-window Vm-exit failed! rc=%Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
-                    return VINF_EM_TRIPLE_FAULT;
-                }
+                *pfWakeupPending = true;
+                Assert(rcStrict != VINF_PGM_CHANGE_MODE);
+                if (rcStrict == VINF_VMX_VMEXIT)
+                    return VINF_SUCCESS;
+                return VBOXSTRICTRC_VAL(rcStrict);
             }
-
-            int rc = emR3GstInjectIntr(pVCpu, pfWakeupPending, pfInjected);
-            if (rc == VINF_VMX_VMEXIT)
-                rc = VINF_SUCCESS;
-            return rc;
-        }
+            AssertMsgFailed(("Interrupt-window Vm-exit failed! rc=%Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
+            return VINF_EM_TRIPLE_FAULT;
+        }
+
+        int rc = emR3GstInjectIntr(pVCpu, pfWakeupPending, pfInjected);
+        if (rc == VINF_VMX_VMEXIT)
+            rc = VINF_SUCCESS;
+        return rc;
     }