Changeset 26847 in vbox for trunk/src

Timestamp:

Feb 26, 2010 1:19:14 PM (15 years ago)

Author:

vboxsync

Message:

Don't pass uAlignment=0 to rtR0MemObjNativeAllocPhys, resolve the alias like is done for the other APIs.

Location:

trunk/src/VBox/Runtime

Files:

• include/internal/memobj.h (modified) (2 diffs)
• r0drv/darwin/memobj-r0drv-darwin.cpp (modified) (1 diff)
• r0drv/freebsd/memobj-r0drv-freebsd.c (modified) (1 diff)
• r0drv/linux/memobj-r0drv-linux.c (modified) (1 diff)
• r0drv/memobj-r0drv.cpp (modified) (2 diffs)
• r0drv/nt/memobj-r0drv-nt.cpp (modified) (1 diff)
• r0drv/os2/memobj-r0drv-os2.cpp (modified) (2 diffs)
• r0drv/solaris/vbi/memobj-r0drv-solaris.c (modified) (1 diff)

trunk/src/VBox/Runtime/include/internal/memobj.h

@@ -354 +354 @@
 
 /**
- * Allocates contiguous page aligned physical memory without (necessarily) any kernel mapping.
+ * Allocates contiguous page aligned physical memory without (necessarily) any
+ * kernel mapping.
  *
  * @returns IPRT status code.
@@ -362 +363 @@
  *                          NIL_RTHCPHYS if any address is acceptable.
  * @param   uAlignment      The alignment of the reserved memory.
- *                          Supported values are 0 (alias for PAGE_SIZE), PAGE_SIZE, _2M, _4M and _1G.
+ *                          Supported values are PAGE_SIZE, _2M, _4M and _1G.
  */
 int rtR0MemObjNativeAllocPhys(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, RTHCPHYS PhysHighest, size_t uAlignment);

trunk/src/VBox/Runtime/r0drv/darwin/memobj-r0drv-darwin.cpp

@@ -570 +570 @@
 int rtR0MemObjNativeAllocPhys(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, RTHCPHYS PhysHighest, size_t uAlignment)
 {
-    /** @todo */
-    if (    uAlignment != 0
-        &&  uAlignment != PAGE_SIZE)
+    /** @todo alignment */
+    if (uAlignment != PAGE_SIZE)
         return VERR_NOT_SUPPORTED;
 

trunk/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c

@@ -331 +331 @@
     /** @todo check if there is a more appropriate API somewhere.. */
 
-    /** @todo */
-    if (    uAlignment != 0
-        &&  uAlignment != PAGE_SIZE)
+    /** @todo alignment */
+    if (uAlignment != PAGE_SIZE)
         return VERR_NOT_SUPPORTED;
 

trunk/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c

@@ -702 +702 @@
 int rtR0MemObjNativeAllocPhys(PPRTR0MEMOBJINTERNAL ppMem, size_t cb, RTHCPHYS PhysHighest, size_t uAlignment)
 {
-    /* @todo */
-    if (    uAlignment != 0
-        &&  uAlignment != PAGE_SIZE)
+    /** @todo alignment */
+    if (uAlignment != PAGE_SIZE)
         return VERR_NOT_SUPPORTED;
 

trunk/src/VBox/Runtime/r0drv/memobj-r0drv.cpp

@@ -587 +587 @@
 RT_EXPORT_SYMBOL(RTR0MemObjAllocPhys);
 
+
 /**
  * Allocates contiguous physical memory without (necessarily) any kernel mapping.
@@ -607 +608 @@
     AssertReturn(cb <= cbAligned, VERR_INVALID_PARAMETER);
     AssertReturn(PhysHighest >= cb, VERR_INVALID_PARAMETER);
+    if (uAlignment == 0)
+        uAlignment = PAGE_SIZE;
+    AssertReturn(    uAlignment == PAGE_SIZE
+                 ||  uAlignment == _2M
+                 ||  uAlignment == _4M
+                 ||  uAlignment == _1G,
+                 VERR_INVALID_PARAMETER);
 #if HC_ARCH_BITS == 32
-    /* Memory allocated in this way is typically mapped into kernel space as well; simply don't allow this
-     * on 32 bits hosts as the kernel space is too crowded already.
-     */
-    if (    uAlignment != 0
-        &&  uAlignment != PAGE_SIZE)
+    /* Memory allocated in this way is typically mapped into kernel space as well; simply
+       don't allow this on 32 bits hosts as the kernel space is too crowded already. */
+    if (uAlignment != PAGE_SIZE)
         return VERR_NOT_SUPPORTED;
-#else
-    AssertReturn((    uAlignment == 0
-                  ||  uAlignment == PAGE_SIZE
-                  ||  uAlignment == _2M
-                  ||  uAlignment == _4M
-                  ||  uAlignment == _1G), VERR_INVALID_PARAMETER);
 #endif
     RT_ASSERT_PREEMPTIBLE();

trunk/src/VBox/Runtime/r0drv/nt/memobj-r0drv-nt.cpp

@@ -401 +401 @@
      * current limit is kind of random...
      */
-    if (cb < _128K
-        && (uAlignment == 0 || uAlignment == PAGE_SIZE))
+    if (   cb < _128K
+        && uAlignment == PAGE_SIZE)
 
     {

trunk/src/VBox/Runtime/r0drv/os2/memobj-r0drv-os2.cpp

@@ -199 +199 @@
     AssertMsgReturn(PhysHighest >= 16 *_1M, ("PhysHigest=%RHp\n", PhysHighest), VERR_NOT_IMPLEMENTED);
 
-    /** @todo */
-    if (    uAlignment != 0
-        &&  uAlignment != PAGE_SIZE)
+    /** @todo alignment  */
+    if (uAlignment != PAGE_SIZE)
         return VERR_NOT_SUPPORTED;
 
@@ -228 +227 @@
 {
     /** @todo rtR0MemObjNativeAllocPhys / darwin. */
-    return rtR0MemObjNativeAllocPhys(ppMem, cb, PhysHighest);
+    return rtR0MemObjNativeAllocPhys(ppMem, cb, PhysHighest, PAGE_SIZE);
 }
 

trunk/src/VBox/Runtime/r0drv/solaris/vbi/memobj-r0drv-solaris.c

@@ -196 +196 @@
     AssertMsgReturn(PhysHighest >= 16 *_1M, ("PhysHigest=%RHp\n", PhysHighest), VERR_NOT_IMPLEMENTED);
 
-    /** @todo */
-    if (    uAlignment != 0
-        &&  uAlignment != PAGE_SIZE)
+    /** @todo alignment */
+    if (uAlignment != PAGE_SIZE)
         return VERR_NOT_SUPPORTED;