Changeset 79453 in vbox for trunk/src/VBox/VMM

Timestamp:

Jul 1, 2019 6:04:13 PM (6 years ago)

Author:

vboxsync

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

131709

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Remove interrupt-window and NMI-window exiting from the VMCS only for the outer guest on exits to ring-3 as we only set it for outer guests currently in hmR0VmxEvaluatePendingEvent.

File:

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

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

@@ -9309 +9309 @@
      * (e.g. TPR below threshold).
      */
-    int rc = hmR0VmxClearIntWindowExitVmcs(pVmcsInfo);
-    rc    |= hmR0VmxClearNmiWindowExitVmcs(pVmcsInfo);
-    AssertRCReturn(rc, rc);
+    if (!CPUMIsGuestInVmxNonRootMode(&pVCpu->cpum.GstCtx))
+    {
+        int rc = hmR0VmxClearIntWindowExitVmcs(pVmcsInfo);
+        rc    |= hmR0VmxClearNmiWindowExitVmcs(pVmcsInfo);
+        AssertRCReturn(rc, rc);
+    }
 
     /* If we're emulating an instruction, we shouldn't have any TRPM traps pending
@@ -9321 +9324 @@
 
     /* Save guest state and restore host state bits. */
-    rc = hmR0VmxLeaveSession(pVCpu);
+    int rc = hmR0VmxLeaveSession(pVCpu);
     AssertRCReturn(rc, rc);
     STAM_COUNTER_DEC(&pVCpu->hm.s.StatSwitchLongJmpToR3);