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

Timestamp:

Jul 8, 2022 3:01:07 PM (3 years ago)

Author:

vboxsync

Message:

VMM/PGM: Fixed issues saving and restoring inactive shadow ROM pages when in NEM mode. bugref:10122

File:

• trunk/src/VBox/VMM/VMMR3/PGMSavedState.cpp (modified) (4 diffs)

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

@@ -467 +467 @@
             {
                 void const *pvPage;
-                rc = pgmPhysPageMapReadOnly(pVM, pPage, GCPhys, &pvPage);
+#ifdef VBOX_WITH_PGM_NEM_MODE
+                if (!PGMROMPROT_IS_ROM(enmProt))
+                    pvPage = &pRom->pbR3Alternate[iPage << GUEST_PAGE_SHIFT];
+                else
+#endif
+                    rc = pgmPhysPageMapReadOnly(pVM, pPage, GCPhys, &pvPage);
                 if (RT_SUCCESS(rc))
                     memcpy(abPage, pvPage, GUEST_PAGE_SIZE);
@@ -553 +558 @@
                     {
                         void const *pvPage;
-                        rc = pgmPhysPageMapReadOnly(pVM, pPage, GCPhys, &pvPage);
+#ifdef VBOX_WITH_PGM_NEM_MODE
+                        if (PGMROMPROT_IS_ROM(enmProt))
+                            pvPage = &pRom->pbR3Alternate[iPage << GUEST_PAGE_SHIFT];
+                        else
+#endif
+                            rc = pgmPhysPageMapReadOnly(pVM, pPage, GCPhys, &pvPage);
                         if (RT_SUCCESS(rc))
                             memcpy(abPage, pvPage, GUEST_PAGE_SIZE);
@@ -2882 +2892 @@
                     default: AssertLogRelFailedReturn(VERR_IPE_NOT_REACHED_DEFAULT_CASE); /* shut up gcc */
                 }
+#ifdef VBOX_WITH_PGM_NEM_MODE
+                bool const fAltPage = pRealPage != NULL;
+#endif
                 if (!pRealPage)
                 {
@@ -2902 +2915 @@
                     case PGM_STATE_REC_ROM_VIRGIN:
                     case PGM_STATE_REC_ROM_SHW_RAW:
-                    {
-                        rc = pgmPhysPageMakeWritableAndMap(pVM, pRealPage, GCPhys, &pvDstPage);
-                        AssertLogRelMsgRCReturn(rc, ("GCPhys=%RGp rc=%Rrc\n", GCPhys, rc), rc);
+#ifdef VBOX_WITH_PGM_NEM_MODE
+                        if (fAltPage)
+                            pvDstPage = &pRom->pbR3Alternate[iPage << GUEST_PAGE_SHIFT];
+                        else
+#endif
+                        {
+                            rc = pgmPhysPageMakeWritableAndMap(pVM, pRealPage, GCPhys, &pvDstPage);
+                            AssertLogRelMsgRCReturn(rc, ("GCPhys=%RGp rc=%Rrc\n", GCPhys, rc), rc);
+                        }
                         break;
-                    }
                 }