Changeset 14645 in vbox for trunk/src

Timestamp:

Nov 26, 2008 2:09:41 PM (16 years ago)

Author:

vboxsync

Message:

SUP, VMM: Moved the max alloc/map page count to VBox/param.h

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/SUPDrv.c (modified) (4 diffs)
• HostDrivers/Support/SUPLib.cpp (modified) (8 diffs)
• HostDrivers/Support/linux/files_vboxdrv (modified) (1 diff)
• VMM/MMHyper.cpp (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -46 +46 @@
 #include <iprt/cpuset.h>
 #include <iprt/uuid.h>
+#include <VBox/param.h>
 #include <VBox/log.h>
 #include <VBox/err.h>
@@ -2071 +2072 @@
     if (cPages < 1 || cPages >= 256)
     {
-        Log(("Illegal request cPages=%d, must be greater than 0 and smaller than 256\n", cPages));
-        return VERR_INVALID_PARAMETER;
+        Log(("Illegal request cPages=%d, must be greater than 0 and smaller than 256.\n", cPages));
+        return VERR_PAGE_COUNT_OUT_OF_RANGE;
     }
 
@@ -2152 +2153 @@
 
     }
-    if (cPages < 1 || cPages > 256)
+    if (cPages < 1 || cPages >= 256)
     {
         Log(("Illegal request cPages=%d, must be greater than 0 and smaller than 256.\n", cPages));
-        return VERR_INVALID_PARAMETER;
+        return VERR_PAGE_COUNT_OUT_OF_RANGE;
     }
 
@@ -2393 +2394 @@
     AssertReturn(ppvR3 || ppvR0, VERR_INVALID_PARAMETER);
     AssertReturn(!fFlags, VERR_INVALID_PARAMETER);
-    if (cPages < 1 || cPages > (128 * _1M)/PAGE_SIZE)
+    if (cPages < 1 || cPages > VBOX_MAX_ALLOC_PAGE_COUNT)
     {
         Log(("SUPR0PageAlloc: Illegal request cb=%u; must be greater than 0 and smaller than 128MB.\n", cPages));
-        return VERR_INVALID_PARAMETER;
+        return VERR_PAGE_COUNT_OUT_OF_RANGE;
     }
 

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -727 +727 @@
     AssertPtrReturn(ppvPages, VERR_INVALID_POINTER);
     *ppvPages = NULL;
-    AssertReturn(cPages > 0, VERR_INVALID_PARAMETER);
+    AssertReturn(cPages > 0, VERR_PAGE_COUNT_OUT_OF_RANGE);
 
 #ifdef RT_OS_WINDOWS
@@ -750 +750 @@
      */
     AssertPtrReturn(pvPages, VERR_INVALID_POINTER);
-    AssertReturn(cPages > 0, VERR_INVALID_PARAMETER);
+    AssertReturn(cPages > 0, VERR_PAGE_COUNT_OUT_OF_RANGE);
 
 #ifdef RT_OS_WINDOWS
@@ -863 +863 @@
      */
     AssertPtrReturn(pvPages, VERR_INVALID_POINTER);
-    AssertReturn(cPages > 0, VERR_INVALID_PARAMETER);
+    AssertReturn(cPages > 0, VERR_PAGE_COUNT_OUT_OF_RANGE);
 
     /*
@@ -912 +912 @@
         *pR0Ptr = NIL_RTR0PTR;
     AssertPtrNullReturn(paPages, VERR_INVALID_POINTER);
-    AssertMsgReturn(cPages > 0 && cPages < 16384, ("cPages=%zu\n", cPages), VERR_INVALID_PARAMETER);
+    AssertMsgReturn(cPages > 0 && cPages <= VBOX_MAX_ALLOC_PAGE_COUNT, ("cPages=%zu\n", cPages), VERR_PAGE_COUNT_OUT_OF_RANGE);
 
     /* fake */
@@ -998 +998 @@
      */
     AssertPtrReturn(pvPages, VERR_INVALID_POINTER);
-    AssertReturn(cPages > 0, VERR_INVALID_PARAMETER);
+    AssertReturn(cPages > 0, VERR_PAGE_COUNT_OUT_OF_RANGE);
 
     /* fake */
@@ -1099 +1099 @@
         return VINF_SUCCESS;
     AssertPtrReturn(pv, VERR_INVALID_POINTER);
-    AssertReturn(cPages > 0, VERR_INVALID_PARAMETER);
+    AssertReturn(cPages > 0, VERR_PAGE_COUNT_OUT_OF_RANGE);
 
     /* fake */
@@ -1134 +1134 @@
     *ppvPages = NULL;
     AssertPtrReturn(paPages, VERR_INVALID_POINTER);
-    AssertMsgReturn(cPages > 0 && cPages < 256, ("cPages=%d must be > 0 and < 256\n", cPages), VERR_INVALID_PARAMETER);
+    AssertMsgReturn(cPages > 0 && cPages < 256, ("cPages=%d must be > 0 and < 256\n", cPages), VERR_PAGE_COUNT_OUT_OF_RANGE);
 
     /* fake */
@@ -1199 +1199 @@
         return VINF_SUCCESS;
     AssertPtrReturn(pv, VERR_INVALID_POINTER);
-    AssertReturn(cPages > 0, VERR_INVALID_PARAMETER);
+    AssertReturn(cPages > 0, VERR_PAGE_COUNT_OUT_OF_RANGE);
 
     /* fake */

trunk/src/VBox/HostDrivers/Support/linux/files_vboxdrv

@@ -59 +59 @@
     ${PATH_ROOT}/include/VBox/err.h=>include/VBox/err.h \
     ${PATH_ROOT}/include/VBox/log.h=>include/VBox/log.h \
+    ${PATH_ROOT}/include/VBox/param.h=>include/VBox/param.h \
     ${PATH_ROOT}/include/VBox/sup.h=>include/VBox/sup.h \
     ${PATH_ROOT}/include/VBox/types.h=>include/VBox/types.h \

trunk/src/VBox/VMM/MMHyper.cpp

@@ -537 +537 @@
     AssertPtrReturn(pvR3, VERR_INVALID_POINTER);
     AssertPtrReturn(paPages, VERR_INVALID_POINTER);
-    AssertReturn(cPages > 0, VERR_INVALID_PARAMETER);
-    AssertReturn(cPages < 128 * _1M / PAGE_SIZE, VERR_INVALID_PARAMETER);
+    AssertReturn(cPages > 0, VERR_PAGE_COUNT_OUT_OF_RANGE);
+    AssertReturn(cPages <= VBOX_MAX_ALLOC_PAGE_COUNT, VERR_PAGE_COUNT_OUT_OF_RANGE);
     AssertPtrReturn(pszDesc, VERR_INVALID_POINTER);
     AssertReturn(*pszDesc, VERR_INVALID_PARAMETER);