Changeset 45546 in vbox for trunk/src

Timestamp:

Apr 14, 2013 8:32:40 PM (12 years ago)

Author:

vboxsync

Message:

VMM/VMMR0: More vectoring event handling.

File:

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

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

@@ -4738 +4738 @@
         typedef enum
         {
-            VMXREFLECTXCPT_XCPT,    /* Reflect Idt-vectoring exception. */
-            VMXREFLECTXCPT_DF,      /* Reflect a double-fault to the guest. */
-            VMXREFLECTXCPT_TF,      /* Reflect a triple fault state to the VMM. */
+            VMXREFLECTXCPT_XCPT,    /* Reflect the exception to the guest or for further evaluation by VMM. */
+            VMXREFLECTXCPT_DF,      /* Reflect the exception as a double-fault to the guest. */
+            VMXREFLECTXCPT_TF,      /* Indicate a triple faulted state to the VMM. */
             VMXREFLECTXCPT_NONE     /* Nothing to reflect. */
         } VMXREFLECTXCPT;
@@ -4754 +4754 @@
             }
             else if (   uExitVector == X86_XCPT_PF
-                     && (   hmR0VmxIsContributoryXcpt(uIdtVector)
-                         || uIdtVector == X86_XCPT_PF))
+                     && uIdtVector == X86_XCPT_PF)
             {
                 pVmxTransient->fVectoringPF = true;
+                enmReflect = VMXREFLECTXCPT_XCPT;
             }
             else if (   hmR0VmxIsContributoryXcpt(uIdtVector)
@@ -4785 +4785 @@
         }
 
-        Assert(pVmxTransient->fVectoringPF == false || enmReflect == VMXREFLECTXCPT_NONE);
         switch (enmReflect)
         {
@@ -8826 +8825 @@
             /* A guest page-fault occurred during delivery of a page-fault. Inject #DF. */
             Log(("Pending #DF due to vectoring #PF.\n"));
+            pVCpu->hm.s.Event.fPending = false;
             rc = hmR0VmxSetPendingXcptDF(pVCpu, pMixedCtx);
         }
@@ -8866 +8866 @@
 #endif
 
+    Assert(!pVmxTransient->fVectoringPF || pVCpu->hm.s.Event.fPending);
+
     rc = hmR0VmxSaveGuestState(pVCpu, pMixedCtx);
     AssertRCReturn(rc, rc);
@@ -8898 +8900 @@
             pMixedCtx->cr2 = pVmxTransient->uExitQualification;
             hmR0VmxSetPendingEvent(pVCpu, VMX_VMCS_CTRL_ENTRY_IRQ_INFO_FROM_EXIT_INT_INFO(pVmxTransient->uExitIntrInfo),
-                                   pVmxTransient->cbInstr, uGstErrorCode, pMixedCtx->cr2);
+                                   0 /* cbInstr */, uGstErrorCode, pMixedCtx->cr2);
         }
         else
@@ -8904 +8906 @@
             /* A guest page-fault occurred during delivery of a page-fault. Inject #DF. */
             TRPMResetTrap(pVCpu);
+            pVCpu->hm.s.Event.fPending = false;
             hmR0VmxSetPendingXcptDF(pVCpu, pMixedCtx);
             Log(("#PF: Pending #DF due to vectoring #PF\n"));