Changeset 92117 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Oct 28, 2021 12:23:50 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

147936

Message:

VMM/PGMPhys: Fixed assertion during ROM reset in simple memory mode. bugref:10122

File:

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

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

@@ -4621 +4621 @@
             for (uint32_t iPage = 0; iPage < cPages && cbSrcLeft > 0; iPage++, pbSrcPage += PAGE_SIZE)
             {
-                const RTGCPHYS GCPhys = pRom->GCPhys + (iPage << PAGE_SHIFT);
-                void const *pvDstPage;
-                int rc = pgmPhysPageMapReadOnly(pVM, &pRom->aPages[iPage].Virgin, GCPhys, &pvDstPage);
+                const RTGCPHYS GCPhys    = pRom->GCPhys + (iPage << PAGE_SHIFT);
+                PPGMPAGE const pPage     = pgmPhysGetPage(pVM, GCPhys);
+                void const    *pvDstPage = NULL;
+                int rc = pgmPhysPageMapReadOnly(pVM, pPage, GCPhys, &pvDstPage);
                 if (RT_FAILURE(rc))
                     break;
@@ -4631 +4632 @@
                     if (pVM->pgm.s.fRestoreRomPagesOnReset)
                     {
-                        void *pvDstPageW;
-                        rc = pgmPhysPageMap(pVM, &pRom->aPages[iPage].Virgin, GCPhys, &pvDstPageW);
+                        void *pvDstPageW = NULL;
+                        rc = pgmPhysPageMap(pVM, pPage, GCPhys, &pvDstPageW);
                         AssertLogRelRCReturn(rc, rc);
                         memcpy(pvDstPageW, pbSrcPage, RT_MIN(cbSrcLeft, PAGE_SIZE));