Changeset 46794 in vbox

Timestamp:

Jun 26, 2013 9:34:52 AM (12 years ago)

Author:

vboxsync

Message:

VMM/HMSVMR0: Fix non-nested paging w/ #PF injection. DSL now boots without nested paging as well.

File:

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

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

@@ -3140 +3140 @@
 
     /* Update CR2 of the guest. */
-    pCtx->cr2 = uFaultAddress;
+    if (pCtx->cr2 != uFaultAddress)
+    {
+        pCtx->cr2 = uFaultAddress;
+        pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_GUEST_CR2;
+    }
 
     hmR0SvmSetPendingEvent(pVCpu, &Event, uFaultAddress);
@@ -4229 +4233 @@
     int rc = PGMTrap0eHandler(pVCpu, u32ErrCode, CPUMCTX2CORE(pCtx), (RTGCPTR)uFaultAddress);
 
-    Log2(("#PF rc=%Rrc\n", rc));
+    Log4(("#PF rc=%Rrc\n", rc));
+
     if (rc == VINF_SUCCESS)
     {