Changeset 27050 in vbox for trunk/src/VBox/Runtime/r0drv

Timestamp:

Mar 4, 2010 5:52:44 PM (15 years ago)

Author:

vboxsync

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

58365

Message:

r0drv/Solaris/alloc-r0drv-solaris: some cleanup.

File:

• trunk/src/VBox/Runtime/r0drv/solaris/vbi/alloc-r0drv-solaris.c (modified) (3 diffs)

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

@@ -38 +38 @@
 
 #include <iprt/assert.h>
+#include <iprt/log.h>
 #include <iprt/param.h>
 #include <iprt/thread.h>
@@ -71 +72 @@
     }
     else
-        cmn_err(CE_NOTE, "rtMemAlloc(%ld, %x) failed\n", cb + sizeof(*pHdr), fFlags);
+        LogRel(("rtMemAlloc(%u, %#x) failed\n", (unsigned)cb + sizeof(*pHdr), fFlags));
     return pHdr;
 }
@@ -93 +94 @@
 RTR0DECL(void *) RTMemContAlloc(PRTCCPHYS pPhys, size_t cb)
 {
-    AssertPtr(pPhys);
-    Assert(cb > 0);
+    AssertPtrReturn(pPhys, NULL);
+    AssertReturn(cb > 0, NULL);
     RT_ASSERT_PREEMPTIBLE();
 
-    /* Allocate physically contiguous page-aligned memory. */
-    caddr_t virtAddr;
-    uint64_t phys = (unsigned)0xffffffff;       /* insist on below 4Gig */
-
-    virtAddr = vbi_contig_alloc(&phys, cb);
+    /* Allocate physically contiguous (< 4GB) page-aligned memory. */
+    uint64_t physAddr = _4G -1;
+    caddr_t virtAddr  = vbi_contig_alloc(&physAddr, cb);
     if (virtAddr == NULL)
     {
-        cmn_err(CE_NOTE, "vbi_contig_alloc for %u failed\n", cb);
+        LogRel(("vbi_contig_alloc failed to allocate %u bytes\n", cb));
         return NULL;
     }
 
-    Assert(phys < (uint64_t)1 << 32);
-
-    *pPhys = phys;
+    Assert(physAddr < _4G);
+    *pPhys = physAddr;
     return virtAddr;
 }