Changeset 91924 in vbox for trunk/src/VBox

Timestamp:

Oct 21, 2021 7:56:06 AM (3 years ago)

Author:

vboxsync

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

147729

Message:

VMM,Devices: Eliminate direct calls to PGMR3SharedModule* APIs and introduce callbacks in the device helper callback table, bugref:10074 [build fix]

File:

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

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

@@ -4407 +4407 @@
              pDevIns->pReg->szName, pDevIns->iInstance, enmGuestOS, pszModuleName, pszModuleName, pszVersion, pszVersion, GCBaseAddr, cbModule, cRegions, paRegions));
 
+#ifdef VBOX_WITH_PAGE_SHARING
     int rc = PGMR3SharedModuleRegister(pDevIns->Internal.s.pVMR3, enmGuestOS, pszModuleName, pszVersion,
                                        GCBaseAddr, cbModule, cRegions, paRegions);
+#else
+    RT_NOREF(enmGuestOS, pszModuleName, pszVersion, GCBaseAddr, cbModule, cRegions, paRegions);
+    int rc = VERR_NOT_SUPPORTED;
+#endif
 
     LogFlow(("pdmR3DevHlp_SharedModuleRegister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
@@ -4424 +4429 @@
              pDevIns->pReg->szName, pDevIns->iInstance, pszModuleName, pszModuleName, pszVersion, pszVersion, GCBaseAddr, cbModule));
 
+#ifdef VBOX_WITH_PAGE_SHARING
     int rc = PGMR3SharedModuleUnregister(pDevIns->Internal.s.pVMR3, pszModuleName, pszVersion, GCBaseAddr, cbModule);
+#else
+    RT_NOREF(pszModuleName, pszVersion, GCBaseAddr, cbModule);
+    int rc = VERR_NOT_SUPPORTED;
+#endif
 
     LogFlow(("pdmR3DevHlp_SharedModuleUnregister: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
@@ -4439 +4449 @@
              pDevIns->pReg->szName, pDevIns->iInstance, GCPtrPage, pfShared, pfPageFlags));
 
-#ifdef DEBUG
+#if defined(VBOX_WITH_PAGE_SHARING) && defined(DEBUG)
     int rc = PGMR3SharedModuleGetPageState(pDevIns->Internal.s.pVMR3, GCPtrPage, pfShared, pfPageFlags);
 #else
@@ -4459 +4469 @@
     LogFlow(("pdmR3DevHlp_SharedModuleCheckAll: caller='%s'/%d:\n", pDevIns->pReg->szName, pDevIns->iInstance));
 
+#ifdef VBOX_WITH_PAGE_SHARING
     int rc = PGMR3SharedModuleCheckAll(pDevIns->Internal.s.pVMR3);
+#else
+    RT_NOREF(pDevIns);
+    int rc = VERR_NOT_SUPPORTED;
+#endif
 
     LogFlow(("pdmR3DevHlp_SharedModuleCheckAll: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));