Changeset 78888 in vbox

Timestamp:

May 31, 2019 8:52:59 AM (6 years ago)

Author:

vboxsync

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

131006

Message:

VMM/IEM: Nested VMX: bugref:9180 Don't signal a NMI-window exiting FF when NMI-window exiting is not set. Fixes spurious NMI-window VM-exit with WinXP nested-guest.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h (modified) (1 diff)

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

@@ -3865 +3865 @@
          */
         if (IEM_VMX_IS_PINCTLS_SET(pVCpu, VMX_PIN_CTLS_NMI_EXIT))
-        {
             fBlockingNmi = false;
 
-            /* Signal a pending NMI-window VM-exit before executing the next instruction. */
-            if (!VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_VMX_NMI_WINDOW))
-                VMCPU_FF_SET(pVCpu, VMCPU_FF_VMX_NMI_WINDOW);
+        /* Signal a pending NMI-window VM-exit before executing the next instruction. */
+        if (   IEM_VMX_IS_PROCCTLS_SET(pVCpu, VMX_PROC_CTLS_NMI_WINDOW_EXIT)
+            && !VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_VMX_NMI_WINDOW))
+        {
+            Assert(IEM_VMX_IS_PINCTLS_SET(pVCpu, VMX_PIN_CTLS_VIRT_NMI));
+            VMCPU_FF_SET(pVCpu, VMCPU_FF_VMX_NMI_WINDOW);
         }