Changeset 100226 in vbox for trunk/src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h

Timestamp:

Jun 20, 2023 12:36:37 PM (22 months ago)

Author:

vboxsync

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

157936

Message:

VMM: VMXAllTemplate.cpp.h: Fixed overly aggressive clearing of interrupt-window/NMI-window clearing.

File:

• trunk/src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h

@@ -4894 +4894 @@
                 return VINF_SUCCESS;
             }
-
-            /*
-             * Setup NMI-window exiting and also clear any interrupt-window exiting that might
-             * still be active. This can happen if we got VM-exits that were higher priority
-             * than an interrupt-window VM-exit.
-             */
             vmxHCSetNmiWindowExitVmcs(pVCpu, pVmcsInfo);
-            vmxHCClearIntWindowExitVmcs(pVCpu, pVmcsInfo);
         }
         else
-            Assert(!(pVmcsInfo->u32ProcCtls & VMX_PROC_CTLS_NMI_WINDOW_EXIT));
+            vmxHCClearNmiWindowExitVmcs(pVCpu, pVmcsInfo);
 
         /*
@@ -4940 +4933 @@
                     STAM_COUNTER_INC(&VCPU_2_VMXSTATS(pVCpu).StatSwitchGuestIrq);
 
-                /* We must clear interrupt-window exiting for the same reason mentioned above for NMIs. */
                 vmxHCClearIntWindowExitVmcs(pVCpu, pVmcsInfo);
                 return VINF_SUCCESS;
             }
-
-            /* Setup interrupt-window exiting. */
             vmxHCSetIntWindowExitVmcs(pVCpu, pVmcsInfo);
-            Assert(!(pVmcsInfo->u32ProcCtls & VMX_PROC_CTLS_NMI_WINDOW_EXIT));
         }
         else
-        {
             vmxHCClearIntWindowExitVmcs(pVCpu, pVmcsInfo);
-            Assert(!(pVmcsInfo->u32ProcCtls & VMX_PROC_CTLS_NMI_WINDOW_EXIT));
-        }
     }
     else