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

Timestamp:

Oct 6, 2008 9:40:43 AM (16 years ago)

Author:

vboxsync

Message:

Same applies to return code checks for PGMShwGetEPTPDPtr.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAll.cpp (modified) (3 diffs)
• PGMAllBth.h (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAll.cpp

@@ -1015 +1015 @@
  * @param   ppPD        Receives address of page directory
  */
-VMMDECL(int)    PGMShwGetEPTPDPtr(PVM pVM, RTGCUINTPTR64 GCPtr, PEPTPDPT *ppPdpt, PEPTPD *ppPD)
+VMMDECL(int) PGMShwGetEPTPDPtr(PVM pVM, RTGCUINTPTR64 GCPtr, PEPTPDPT *ppPdpt, PEPTPD *ppPD)
 {
     PPGM           pPGM   = &pVM->pgm.s;
@@ -1038 +1038 @@
         if (rc == VERR_PGM_POOL_FLUSHED)
         {
+            Log(("PGMShwSyncEPTPDPtr: PGM pool flushed (1) -> signal sync cr3\n"));
             Assert(pVM->pgm.s.fSyncFlags & PGM_SYNC_CLEAR_PGM_POOL);
             VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3);
@@ -1069 +1070 @@
         if (rc == VERR_PGM_POOL_FLUSHED)
         {
+            Log(("PGMShwSyncEPTPDPtr: PGM pool flushed (2) -> signal sync cr3\n"));
             Assert(pVM->pgm.s.fSyncFlags & PGM_SYNC_CLEAR_PGM_POOL);
             VM_FF_SET(pVM, VM_FF_PGM_SYNC_CR3);

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -169 +169 @@
 
     rc = PGMShwGetEPTPDPtr(pVM, (RTGCUINTPTR)pvFault, NULL, &pPDDst);
-    AssertRCReturn(rc, rc);
+    AssertReturn(rc == VINF_SUCCESS /* *must* test for VINF_SUCCESS!! */, rc);
     Assert(pPDDst);
 # endif
@@ -1853 +1853 @@
 
     int rc = PGMShwGetEPTPDPtr(pVM, GCPtrPage, NULL, &pPDDst);
-    AssertRCReturn(rc, rc);
+    AssertReturn(rc == VINF_SUCCESS /* *must* test for VINF_SUCCESS!! */, rc);
     Assert(pPDDst);
     PdeDst = pPDDst->a[iPDDst];
@@ -2702 +2702 @@
 
     rc = PGMShwGetEPTPDPtr(pVM, GCPtrPage, &pPdptDst, &pPDDst);
-    AssertRCReturn(rc, rc);
+    AssertReturn(rc == VINF_SUCCESS /* *must* test for VINF_SUCCESS!! */, rc);
     Assert(pPDDst);