Changeset 71720 in vbox for trunk/src/VBox/VMM

Timestamp:

Apr 6, 2018 6:51:44 PM (7 years ago)

Author:

vboxsync

Message:

PATM: Don't try pass stuff to patmRCVirtPagePfHandle that's not needed, as it seems the page address (pPage) isn't a hypervisor address, but guest one.

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/PATM.cpp (modified) (2 diffs)
• VMMR3/PATMSSM.cpp (modified) (1 diff)
• VMMRC/PATMRC.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/PATM.cpp

@@ -847 +847 @@
                                                      pPage,
                                                      pPage + (PAGE_SIZE - 1) /* inclusive! */,
-                                                     (void *)(uintptr_t)pPage, pPage, NULL /*pszDesc*/);
+                                                     (void *)(uintptr_t)pPage, NIL_RTRCPTR /*pvUserRC*/, NULL /*pszDesc*/);
                     Assert(RT_SUCCESS(rc) || rc == VERR_PGM_HANDLER_VIRTUAL_CONFLICT);
                 }
@@ -929 +929 @@
                                                      pPage,
                                                      pPage + (PAGE_SIZE - 1) /* inclusive! */,
-                                                     (void *)(uintptr_t)pPage, pPage, NULL /*pszDesc*/);
+                                                     (void *)(uintptr_t)pPage, NIL_RTRCPTR /*pvUserRC*/, NULL /*pszDesc*/);
                     Assert(RT_SUCCESS(rc) || rc == VERR_PGM_HANDLER_VIRTUAL_CONFLICT);
                 }

trunk/src/VBox/VMM/VMMR3/PATMSSM.cpp

@@ -1503 +1503 @@
                                                  pPage,
                                                  pPage + (PAGE_SIZE - 1) /* inclusive! */,
-                                                 (void *)(uintptr_t)pPage, pPage, NULL /*pszDesc*/);
+                                                 (void *)(uintptr_t)pPage, NIL_RTRCPTR /*pvUserRC*/, NULL /*pszDesc*/);
                 Assert(RT_SUCCESS(rc) || rc == VERR_PGM_HANDLER_VIRTUAL_CONFLICT);
             }

trunk/src/VBox/VMM/VMMRC/PATMRC.cpp

@@ -47 +47 @@
  *      PATM all access handler callback.}
  *
- * @remarks The @a pvUser argument is the base address of the page being
- *          monitored.
+ * @remarks pvUser is NULL.
  */
 DECLEXPORT(VBOXSTRICTRC) patmRCVirtPagePfHandler(PVM pVM, PVMCPU pVCpu, RTGCUINT uErrorCode, PCPUMCTXCORE pCtxCore,
@@ -54 +53 @@
 {
     NOREF(pVCpu); NOREF(uErrorCode); NOREF(pCtxCore); NOREF(pvFault); NOREF(pvRange); NOREF(offRange); RT_NOREF_PV(pvUser);
-
-    Assert(pvUser);
-    Assert(!((uintptr_t)pvUser & PAGE_OFFSET_MASK));
-    Assert(((uintptr_t)pvUser + (pvFault & PAGE_OFFSET_MASK)) == pvRange + offRange);
 
     pVM->patm.s.pvFaultMonitor = (RTRCPTR)(pvRange + offRange);