Changeset 91850 in vbox

Timestamp:

Oct 19, 2021 11:27:43 PM (3 years ago)

Author:

vboxsync

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

147652

Message:

VMM/NEM,PGM: Build fixes. bugref:10122

File:

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

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

@@ -16 +16 @@
  */
 
+#undef VBOX_WITH_NATIVE_NEM
 
 /*********************************************************************************************************************************
@@ -1196 +1197 @@
         return rc;
     }
-#endif /* VBOX_WITH_PGM_NEM_MODE */
+#else  /* !VBOX_WITH_PGM_NEM_MODE */
+    RT_NOREF(pvMmio2);
+#endif /* !VBOX_WITH_PGM_NEM_MODE */
 
     /*
@@ -3911 +3914 @@
 
     PGM_UNLOCK(pVM);
-    return rc;
+    return rcRet;
 }
 
@@ -4416 +4419 @@
             }
 
+#ifdef VBOX_WITH_NATIVE_NEM
             /* Set the NEM state of the pages if needed. */
             if (u2NemState != UINT8_MAX)
                 pgmPhysSetNemStateForPages(&pRamNew->aPages[idxFirstRamPage], cPages, u2NemState);
+#endif
 
             /* Flush physical page map TLB. */
@@ -4528 +4533 @@
                             GMMR3AllocatePagesCleanup(pReq);
 
+#ifdef VBOX_WITH_NATIVE_NEM
                         /*
                          * Notify NEM again.
@@ -4537 +4543 @@
                             pgmPhysSetNemStateForPages(&pRamNew->aPages[idxFirstRamPage], cPages, u2NemState);
                         if (RT_SUCCESS(rc))
+#endif
                             return rc;
 
@@ -4542 +4549 @@
                          * bail out
                          */
+#ifdef VBOX_WITH_NATIVE_NEM
                         /* unlink */
                         if (pRomPrev)
@@ -4556 +4564 @@
                         if (fFlags & PGMPHYS_ROM_FLAGS_SHADOWED)
                         {
-#ifdef VBOX_WITH_PGM_NEM_MODE
+# ifdef VBOX_WITH_PGM_NEM_MODE
                             if (pVM->pgm.s.fNemMode)
                                 pVM->pgm.s.cPrivatePages -= cPages;
                             else
-#endif
+# endif
                                 pVM->pgm.s.cZeroPages -= cPages;
                             pVM->pgm.s.cAllPages -= cPages;
                         }
-
+#endif
                     }
                     else
@@ -4890 +4898 @@
                     if (rc2 != VINF_SUCCESS && (rc == VINF_SUCCESS || RT_FAILURE(rc2)))
                         rc = rc2;
+#ifdef VBOX_WITH_NATIVE_NEM
                     uint8_t u2State = PGM_PAGE_GET_NEM_STATE(pRamPage);
+#endif
 
                     PPGMPAGE pOld = PGMROMPROT_IS_ROM(pRomPage->enmProt) ? &pRomPage->Virgin : &pRomPage->Shadow;
@@ -5727 +5737 @@
         PGM_PAGE_SET_NEM_STATE(pPage, u2State);
     }
+#else
+    RT_NOREF(enmNewType);
 #endif