儲存庫 vbox 的更動 66981

時間撮記:

2017-5-19 下午01:11:27 (8 年 以前)

作者:

vboxsync

訊息:

VMM/HMSVMR0: Fixes to hmR0SvmCheckExitDueToEventDelivery.

檔案:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (修改) (3 筆差異)

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

@@ -4072 +4072 @@
              *   - a hardware exception or external interrupt, we re-inject it.
              */
+            fRaiseInfo = IEMXCPTRAISEINFO_NONE;
             if (pVmcb->ctrl.ExitIntInfo.n.u3Type == SVM_EVENT_SOFTWARE_INT)
-            {
-                enmRaise   = IEMXCPTRAISE_REEXEC_INSTR;
-                fRaiseInfo = IEMXCPTRAISEINFO_NONE;
-            }
-            else if (pVmcb->ctrl.ExitIntInfo.n.u3Type == SVM_EVENT_NMI)
-            {
-                enmRaise   = IEMXCPTRAISE_PREV_EVENT;
-                fRaiseInfo = IEMXCPTRAISEINFO_NMI_XCPT;
-            }
+                enmRaise = IEMXCPTRAISE_REEXEC_INSTR;
             else
-            {
-                enmRaise   = IEMXCPTRAISE_PREV_EVENT;
-                fRaiseInfo = IEMXCPTRAISEINFO_NONE;
-            }
+                enmRaise = IEMXCPTRAISE_PREV_EVENT;
         }
 
@@ -4099 +4089 @@
                     RTGCUINTPTR GCPtrFaultAddress = 0;
 
-                    /* If we are re-injecting the NMI, clear NMI blocking. */
-                    if (fRaiseInfo & IEMXCPTRAISEINFO_NMI_XCPT)
+                    /* If we are re-injecting an NMI, clear NMI blocking. */
+                    if (pVmcb->ctrl.ExitIntInfo.n.u3Type == SVM_EVENT_NMI)
                         VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_BLOCK_NMIS);
 
@@ -4106 +4096 @@
                     if (fRaiseInfo & (IEMXCPTRAISEINFO_EXT_INT_PF | IEMXCPTRAISEINFO_NMI_PF))
                         pSvmTransient->fVectoringPF = true;
-                    else if (   uIdtVector == X86_XCPT_PF
-                             && pVmcb->ctrl.ExitIntInfo.n.u3Type == SVM_EVENT_EXCEPTION)
+                    else if (   pVmcb->ctrl.ExitIntInfo.n.u3Type == SVM_EVENT_EXCEPTION
+                             && uIdtVector == X86_XCPT_PF)
                     {
                         /*