vbox的更動 39402 路徑 trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp

時間撮記:

2011-11-23 下午04:25:04 (13 年 以前)

作者:

vboxsync

訊息:

VMM: don't use generic IPE status codes, use specific ones. Part 1.

檔案:

• trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp (修改) (8 筆差異)

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

@@ -116 +116 @@
                 }
             }
-            else if (RT_UNLIKELY(rc == VERR_INTERNAL_ERROR))
+            else if (RT_UNLIKELY(rc == VERR_EM_INTERNAL_DISAS_ERROR))
                 return rc;
             break;
@@ -135 +135 @@
             AssertMsgFailedReturn(("enmProt=%d iPage=%d GCPhysFault=%RGp\n",
                                    pRom->aPages[iPage].enmProt, iPage, GCPhysFault),
-                                  VERR_INTERNAL_ERROR);
+                                  VERR_IPE_NOT_REACHED_DEFAULT_CASE);
     }
 
@@ -513 +513 @@
                             &&  pVM->pgm.s.cHandyPages <= RT_ELEMENTS(pVM->pgm.s.aHandyPages),
                             ("%u\n", pVM->pgm.s.cHandyPages),
-                            VERR_INTERNAL_ERROR);
+                            VERR_PGM_HANDY_PAGE_IPE);
         }
         else
@@ -1029 +1029 @@
     if (idChunk == NIL_GMM_CHUNKID)
     {
-        AssertMsgReturn(PGM_PAGE_GET_PAGEID(pPage) == NIL_GMM_PAGEID, ("pPage=%R[pgmpage]\n", pPage), VERR_INTERNAL_ERROR_2);
+        AssertMsgReturn(PGM_PAGE_GET_PAGEID(pPage) == NIL_GMM_PAGEID, ("pPage=%R[pgmpage]\n", pPage), VERR_PGM_PHYS_PAGE_MAP_IPE_1);
         if (PGM_PAGE_GET_TYPE(pPage) == PGMPAGETYPE_MMIO2)
         {
             /* Lookup the MMIO2 range and use pvR3 to calc the address. */
             PPGMRAMRANGE pRam = pgmPhysGetRange(pVM, GCPhys);
-            AssertMsgReturn(pRam || !pRam->pvR3, ("pRam=%p pPage=%R[pgmpage]\n", pRam, pPage), VERR_INTERNAL_ERROR_2);
+            AssertMsgReturn(pRam || !pRam->pvR3, ("pRam=%p pPage=%R[pgmpage]\n", pRam, pPage), VERR_PGM_PHYS_PAGE_MAP_IPE_2);
             *ppv = (void *)((uintptr_t)pRam->pvR3 + (uintptr_t)((GCPhys & ~(RTGCPHYS)PAGE_OFFSET_MASK) - pRam->GCPhys));
         }
@@ -1043 +1043 @@
              * them, that would also avoid this mess. It would actually be kind of
              * elegant... */
-            AssertLogRelMsgFailedReturn(("%RGp\n", GCPhys), VERR_INTERNAL_ERROR_3);
+            AssertLogRelMsgFailedReturn(("%RGp\n", GCPhys), VERR_PGM_MAP_MMIO2_ALIAS_MMIO);
         }
         else
         {
             /** @todo handle MMIO2 */
-            AssertMsgReturn(PGM_PAGE_IS_ZERO(pPage), ("pPage=%R[pgmpage]\n", pPage), VERR_INTERNAL_ERROR_2);
+            AssertMsgReturn(PGM_PAGE_IS_ZERO(pPage), ("pPage=%R[pgmpage]\n", pPage), VERR_PGM_PHYS_PAGE_MAP_IPE_3);
             AssertMsgReturn(PGM_PAGE_GET_HCPHYS(pPage) == pVM->pgm.s.HCPhysZeroPg,
                             ("pPage=%R[pgmpage]\n", pPage),
-                            VERR_INTERNAL_ERROR_2);
+                            VERR_PGM_PHYS_PAGE_MAP_IPE_4);
             *ppv = pVM->pgm.s.CTXALLSUFF(pvZeroPg);
         }
@@ -1306 +1306 @@
 {
     int rc;
-    AssertReturn(pPage, VERR_INTERNAL_ERROR);
+    AssertReturn(pPage, VERR_PGM_PHYS_NULL_PAGE_PARAM);
     PGM_LOCK_ASSERT_OWNER(pVM);
     pVM->pgm.s.cDeprecatedPageLocks++;
@@ -1436 +1436 @@
 {
     int rc;
-    AssertReturn(pPage, VERR_INTERNAL_ERROR);
+    AssertReturn(pPage, VERR_PGM_PHYS_NULL_PAGE_PARAM);
     PGM_LOCK_ASSERT_OWNER(pVM);
 
@@ -1499 +1499 @@
 int pgmPhysGCPhys2CCPtrInternalReadOnly(PVM pVM, PPGMPAGE pPage, RTGCPHYS GCPhys, const void **ppv, PPGMPAGEMAPLOCK pLock)
 {
-    AssertReturn(pPage, VERR_INTERNAL_ERROR);
+    AssertReturn(pPage, VERR_PGM_PHYS_NULL_PAGE_PARAM);
     PGM_LOCK_ASSERT_OWNER(pVM);
     Assert(PGM_PAGE_GET_HCPHYS(pPage) != 0);