Changeset 66961 in vbox

Timestamp:

May 19, 2017 7:14:58 AM (8 years ago)

Author:

vboxsync

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

115502

Message:

VMM/HMSVMR0: Clear NMI blocking if we're re-injecting an NMI that caused an exception, and not just when a #PF.

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (1 diff)

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

@@ -4080 +4080 @@
                     RTGCUINTPTR GCPtrFaultAddress = 0;
 
+                    /* If we are re-injecting the NMI, clear NMI blocking. */
+                    if (fRaiseInfo & IEMXCPTRAISEINFO_NMI_XCPT)
+                        VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_BLOCK_NMIS);
+
                     /* Determine a vectoring #PF condition, see comment in hmR0SvmExitXcptPF(). */
                     if (fRaiseInfo & (IEMXCPTRAISEINFO_EXT_INT_PF | IEMXCPTRAISEINFO_NMI_PF))
-                    {
                         pSvmTransient->fVectoringPF = true;
-                        /* If we are re-injecting the NMI, clear NMI blocking. */
-                        if (fRaiseInfo & IEMXCPTRAISEINFO_NMI_XCPT)
-                            VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_BLOCK_NMIS);
-                    }
                     else if (uIdtVector == X86_XCPT_PF)
                     {