Changeset 45715 in vbox for trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

Timestamp:

Apr 24, 2013 5:37:24 PM (12 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Theoretically possibly to miss a CR2 update when we should.

File:

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

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

@@ -8803 +8803 @@
         if (RT_LIKELY(!pVmxTransient->fVectoringPF))
         {
-            pVCpu->hm.s.Event.fPending = false;     /* In case it's a contributory #PF. */
+            pVCpu->hm.s.Event.fPending = false;                  /* In case it's a contributory #PF. */
+            pMixedCtx->cr2 = pVmxTransient->uExitQualification;  /* Update here in case we go back to ring-3 before injection. */
             hmR0VmxSetPendingEvent(pVCpu, VMX_VMCS_CTRL_ENTRY_IRQ_INFO_FROM_EXIT_INT_INFO(pVmxTransient->uExitIntrInfo),
                                    0 /* cbInstr */, pVmxTransient->uExitIntrErrorCode, pVmxTransient->uExitQualification);
@@ -8882 +8883 @@
             uint32_t uGstErrorCode = TRPMGetErrorCode(pVCpu);
             TRPMResetTrap(pVCpu);
-            pVCpu->hm.s.Event.fPending = false;     /* In case it's a contributory #PF. */
+            pVCpu->hm.s.Event.fPending = false;                 /* In case it's a contributory #PF. */
+            pMixedCtx->cr2 = pVmxTransient->uExitQualification; /* Update here in case we go back to ring-3 before injection. */
             hmR0VmxSetPendingEvent(pVCpu, VMX_VMCS_CTRL_ENTRY_IRQ_INFO_FROM_EXIT_INT_INFO(pVmxTransient->uExitIntrInfo),
                                    0 /* cbInstr */, uGstErrorCode, pVmxTransient->uExitQualification);