Changeset 73277 in vbox for trunk/src

Timestamp:

Jul 20, 2018 6:30:34 PM (7 years ago)

Author:

vboxsync

Message:

PGM: Eliminated the unused VERR_PGM_POOL_FLUSHED and VERR_PGM_POOL_CLEARED status codes. Found checking out PGMHCChangeMode. bugref:9044

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAllBth.h (modified) (2 diffs)
• VMMAll/PGMAllPool.cpp (modified) (12 diffs)
• include/PGMInternal.h (modified) (1 diff)

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

@@ -142 +142 @@
                           NIL_PGMPOOL_IDX, UINT32_MAX, false /*fLockPage*/,
                           &pNewShwPageCR3);
-    if (rc == VERR_PGM_POOL_FLUSHED) /** @todo r=bird: VERR_PGM_POOL_FLUSHED won't be returned */
-    {
-        Log(("Bth-Enter: PGM pool flushed -> signal sync cr3\n"));
-        Assert(VMCPU_FF_IS_SET(pVCpu, VMCPU_FF_PGM_SYNC_CR3));
-        pgmUnlock(pVM);
-        return VINF_PGM_SYNC_CR3;
-    }
     AssertRCReturn(rc, rc);
 
@@ -2952 +2945 @@
             return VINF_SUCCESS;
         }
-        else if (rc == VERR_PGM_POOL_FLUSHED) /** @todo r=bird: VERR_PGM_POOL_FLUSHED won't be returned */
-        {
-            VMCPU_FF_SET(pVCpu, VMCPU_FF_PGM_SYNC_CR3);
-            PGM_DYNMAP_UNUSED_HINT(pVCpu, pPdeDst);
-            return VINF_PGM_SYNC_CR3;
-        }
         else
             AssertMsgFailedReturn(("rc=%Rrc\n", rc), RT_FAILURE_NP(rc) ? rc : VERR_IPE_UNEXPECTED_INFO_STATUS);

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

@@ -93 +93 @@
  * Flushes a chain of pages sharing the same access monitor.
  *
- * @returns VBox status code suitable for scheduling.
  * @param   pPool       The pool.
  * @param   pPage       A page in the chain.
- * @todo VBOXSTRICTRC
- */
-int pgmPoolMonitorChainFlush(PPGMPOOL pPool, PPGMPOOLPAGE pPage)
+ */
+void pgmPoolMonitorChainFlush(PPGMPOOL pPool, PPGMPOOLPAGE pPage)
 {
     LogFlow(("pgmPoolMonitorChainFlush: Flush page %RGp type=%d\n", pPage->GCPhys, pPage->enmKind));
@@ -119 +117 @@
      * Iterate the list flushing each shadow page.
      */
-    int rc = VINF_SUCCESS;
     for (;;)
     {
@@ -134 +131 @@
         pPage = &pPool->aPages[idx];
     }
-    return rc;
 }
 
@@ -868 +864 @@
      * First, do the flushing.
      */
-    int rc = pgmPoolMonitorChainFlush(pPool, pPage);
+    pgmPoolMonitorChainFlush(pPool, pPage);
 
     /*
@@ -874 +870 @@
      * Must do this in raw mode (!); XP boot will fail otherwise.
      */
+    int rc = VINF_SUCCESS;
     VBOXSTRICTRC rc2 = EMInterpretInstructionDisasState(pVCpu, pDis, pRegFrame, pvFault, EMCODETYPE_ALL);
     if (rc2 == VINF_SUCCESS)
@@ -879 +876 @@
     else if (rc2 == VINF_EM_RESCHEDULE)
     {
-        if (rc == VINF_SUCCESS)
-            rc = VBOXSTRICTRC_VAL(rc2);
+        rc = VBOXSTRICTRC_VAL(rc2);
 # ifndef IN_RING3
         VMCPU_FF_SET(pVCpu, VMCPU_FF_TO_R3);
@@ -1486 +1482 @@
         }
         else
-        {
-            /* ASSUME that VERR_PGM_POOL_CLEARED can be ignored here and that FFs will deal with it in due time. */
             pgmPoolMonitorChainFlush(pPool, pPage);
-        }
 
         STAM_PROFILE_STOP_EX(&pPool->CTX_SUFF_Z(StatMonitor), &pPool->CTX_MID_Z(StatMonitor,FlushPage), a);
@@ -2920 +2913 @@
  * @returns VBox status code.
  * @retval  VINF_SUCCESS if successfully added.
- * @retval  <del>VERR_PGM_POOL_FLUSHED</del> if the pool was flushed - this is
- *          not returned anywhere anymore.
+ *
  * @param   pPool       The pool.
  * @param   iUser       The user index.
@@ -2951 +2943 @@
  * @returns VBox status code.
  * @retval  VINF_SUCCESS if successfully added.
- * @retval  <del>VERR_PGM_POOL_FLUSHED</del> if the pool was flushed - this is
- *          not returned anywhere anymore.
  *
  * @param   pPool       The pool.
@@ -3041 +3031 @@
  * @returns VBox status code.
  * @retval  VINF_SUCCESS if successfully added.
- * @retval  <del>VERR_PGM_POOL_FLUSHED</del> if the pool was flushed - this is
- *          not returned anywhere anymore.
  *
  * @param   pPool       The pool.
@@ -5104 +5092 @@
  * @returns VBox status code.
  * @retval  VINF_SUCCESS on success.
- * @retval  <del>VERR_PGM_POOL_FLUSHED</del> if the pool was flushed - this is
- *          not returned anywhere anymore.
  *
  * @param   pPool       The pool.
@@ -5157 +5143 @@
  * @retval  VINF_SUCCESS if a NEW page was allocated.
  * @retval  VINF_PGM_CACHED_PAGE if a CACHED page was returned.
- * @retval  <del>VERR_PGM_POOL_FLUSHED</del> if the pool was flushed - this is
- *          not returned anywhere anymore.
  *
  * @param   pVM         The cross context VM structure.

trunk/src/VBox/VMM/include/PGMInternal.h

@@ -4289 +4289 @@
 uint16_t        pgmPoolTrackPhysExtAddref(PVM pVM, PPGMPAGE pPhysPage, uint16_t u16, uint16_t iShwPT, uint16_t iPte);
 void            pgmPoolTrackPhysExtDerefGCPhys(PPGMPOOL pPool, PPGMPOOLPAGE pPoolPage, PPGMPAGE pPhysPage, uint16_t iPte);
-int             pgmPoolMonitorChainFlush(PPGMPOOL pPool, PPGMPOOLPAGE pPage);
+void            pgmPoolMonitorChainFlush(PPGMPOOL pPool, PPGMPOOLPAGE pPage);
 void            pgmPoolMonitorModifiedInsert(PPGMPOOL pPool, PPGMPOOLPAGE pPage);
 PGM_ALL_CB2_PROTO(FNPGMPHYSHANDLER) pgmPoolAccessHandler;