Changeset 93210 in vbox

Timestamp:

Jan 13, 2022 2:08:52 AM (3 years ago)

Author:

vboxsync

Message:

VMM/PGMR3PhysMmio2Register: Call MMR3AdjustFixedReservation even in NEM mode. bugref:10122

File:

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

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

@@ -3052 +3052 @@
      * most likely to fail.
      */
-    int rc = VINF_SUCCESS;
-#ifdef VBOX_WITH_PGM_NEM_MODE
-    if (!pVM->pgm.s.fNemMode)
-#endif
-        rc = MMR3AdjustFixedReservation(pVM, cPages, pszDesc);
+    int rc = MMR3AdjustFixedReservation(pVM, cPages, pszDesc);
     if (RT_SUCCESS(rc))
     {
@@ -3062 +3058 @@
         if (RT_SUCCESS(rc))
         {
-            void *pvPages;
+            void   *pvPages   = NULL;
 #ifndef VBOX_WITH_LINEAR_HOST_PHYS_MEM
             RTR0PTR pvPagesR0 = NIL_RTR0PTR;
 #endif
-
 #ifdef VBOX_WITH_PGM_NEM_MODE
-            if (!pVM->pgm.s.fNemMode)
+            if (PGM_IS_IN_NEM_MODE(pVM))
+            {
+                for (uint32_t i = 0; i < cPages; i++)
+                {
+                    paPages[i].Phys       = UINT64_C(0x0000fffffffff000);
+                    paPages[i].uReserved = 0;
+                }
+                rc = SUPR3PageAlloc(cPages, pVM->pgm.s.fUseLargePages ? SUP_PAGE_ALLOC_F_LARGE_PAGES : 0, &pvPages);
+            }
+            else
 #endif
             {
@@ -3077 +3081 @@
 #endif
             }
-#ifdef VBOX_WITH_PGM_NEM_MODE
-            else
-            {
-                rc = SUPR3PageAlloc(cPages, pVM->pgm.s.fUseLargePages ? SUP_PAGE_ALLOC_F_LARGE_PAGES : 0, &pvPages);
-                if (RT_SUCCESS(rc))
-                    for (uint32_t i = 0; i < cPages; i++)
-                        paPages[i].Phys = UINT64_C(0x0000fffffffff000);
-            }
-#endif
             if (RT_SUCCESS(rc))
             {