Changeset 56255 in vbox

Timestamp:

Jun 5, 2015 10:58:47 AM (10 years ago)

Author:

vboxsync

Message:

updates

File:

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

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

@@ -76 +76 @@
      */
     AssertReturn(cRegions <= VMMDEVSHAREDREGIONDESC_MAX, VERR_INVALID_PARAMETER);
+    if (!pVM->pgm.s.fPageFusionAllowed)
+        return VERR_NOT_SUPPORTED;
 
     /*
@@ -148 +150 @@
 {
     Log(("PGMR3SharedModuleUnregister name=%s version=%s base=%RGv size=%x\n", pszModuleName, pszVersion, GCBaseAddr, cbModule));
+
     AssertMsgReturn(cbModule > 0 && cbModule < _1G, ("%u\n", cbModule), VERR_OUT_OF_RANGE);
-
+    if (!pVM->pgm.s.fPageFusionAllowed)
+        return VERR_NOT_SUPPORTED;
 
     /*
@@ -260 +264 @@
 VMMR3DECL(int) PGMR3SharedModuleCheckAll(PVM pVM)
 {
+    if (!pVM->pgm.s.fPageFusionAllowed)
+        return VERR_NOT_SUPPORTED;
+
     /* Queue the actual registration as we are under the IOM lock right now. Perform this operation on the way out. */
     return VMR3ReqCallNoWait(pVM, VMCPUID_ANY_QUEUE, (PFNRT)pgmR3CheckSharedModulesHelper, 2, pVM, VMMGetCpuId(pVM));