Changeset 23453 in vbox for trunk/src/VBox/VMM/PGMPhys.cpp

Timestamp:

Sep 30, 2009 9:55:25 PM (15 years ago)

Author:

vboxsync

Message:

PGMPhysPageMap cleanup.

File:

• trunk/src/VBox/VMM/PGMPhys.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -1168 +1168 @@
                             {
                                 void *pvPage;
-                                PPGMPAGEMAP pMapIgnored;
-                                rc = pgmPhysPageMap(pVM, pPage, pRam->GCPhys + ((RTGCPHYS)iPage << PAGE_SHIFT), &pMapIgnored, &pvPage);
+                                rc = pgmPhysPageMap(pVM, pPage, pRam->GCPhys + ((RTGCPHYS)iPage << PAGE_SHIFT), &pvPage);
                                 AssertLogRelRCReturn(rc, rc);
                                 ASMMemZeroPage(pvPage);
@@ -2329 +2328 @@
                 {
                     void *pvDstPage;
-                    PPGMPAGEMAP pMapIgnored;
-                    rc = pgmPhysPageMap(pVM, pRamPage, GCPhys + (iPage << PAGE_SHIFT), &pMapIgnored, &pvDstPage);
+                    rc = pgmPhysPageMap(pVM, pRamPage, GCPhys + (iPage << PAGE_SHIFT), &pvDstPage);
                     if (RT_FAILURE(rc))
                     {
@@ -2483 +2481 @@
                 int rc = pgmLock(pVM);
                 AssertRC(rc);
+
                 PPGMPAGE pShadowPage = &pRomPage->Shadow;
                 if (!PGMROMPROT_IS_ROM(pRomPage->enmProt))
@@ -2490 +2489 @@
                 }
 
-                pRomPage->LiveSave.fWrittenTo = true;
-                if (RT_UNLIKELY(PGM_PAGE_GET_STATE(pShadowPage) != PGM_PAGE_STATE_ALLOCATED))
+                void *pvDstPage;
+                rc = pgmPhysPageMakeWritableAndMap(pVM, pShadowPage, GCPhys & X86_PTE_PG_MASK, &pvDstPage);
+                if (RT_SUCCESS(rc))
                 {
-                    rc = pgmPhysPageMakeWritable(pVM, pShadowPage, GCPhys);
-                    if (RT_FAILURE(rc))
-                    {
-                        pgmUnlock(pVM);
-                        return rc;
-                    }
-                    AssertMsg(rc == VINF_SUCCESS || rc == VINF_PGM_SYNC_CR3 /* returned */, ("%Rrc\n", rc));
+                    memcpy((uint8_t *)pvDstPage + (GCPhys & PAGE_OFFSET_MASK), pvBuf, cbBuf);
+                    pRomPage->LiveSave.fWrittenTo = true;
                 }
-
-                void       *pvDstPage;
-                PPGMPAGEMAP pMapIgnored;
-                int rc2 = pgmPhysPageMap(pVM, pShadowPage, GCPhys & X86_PTE_PG_MASK, &pMapIgnored, &pvDstPage);
-                if (RT_SUCCESS(rc2))
-                    memcpy((uint8_t *)pvDstPage + (GCPhys & PAGE_OFFSET_MASK), pvBuf, cbBuf);
-                else
-                    rc = rc2;
 
                 pgmUnlock(pVM);
@@ -2582 +2569 @@
                 {
                     Assert(PGM_PAGE_GET_STATE(&pRom->aPages[iPage].Shadow) != PGM_PAGE_STATE_ZERO);
-
+                    void *pvDstPage;
                     const RTGCPHYS GCPhys = pRom->GCPhys + (iPage << PAGE_SHIFT);
-                    rc = pgmPhysPageMakeWritable(pVM, &pRom->aPages[iPage].Shadow, GCPhys);
-                    if (RT_FAILURE(rc))
-                        break;
-
-                    void *pvDstPage;
-                    PPGMPAGEMAP pMapIgnored;
-                    rc = pgmPhysPageMap(pVM, &pRom->aPages[iPage].Shadow, GCPhys, &pMapIgnored, &pvDstPage);
+                    rc = pgmPhysPageMakeWritableAndMap(pVM, &pRom->aPages[iPage].Shadow, GCPhys, &pvDstPage);
                     if (RT_FAILURE(rc))
                         break;
@@ -2609 +2590 @@
             {
                 const RTGCPHYS GCPhys = pRom->GCPhys + (iPage << PAGE_SHIFT);
-                PPGMPAGEMAP pMapIgnored;
-                void *pvDstPage;
-                int rc = pgmPhysPageMap(pVM, &pRom->aPages[iPage].Virgin, GCPhys, &pMapIgnored, &pvDstPage);
+                void const *pvDstPage;
+                int rc = pgmPhysPageMapReadOnly(pVM, &pRom->aPages[iPage].Virgin, GCPhys, &pvDstPage);
                 if (RT_FAILURE(rc))
                     break;