Changeset 27037 in vbox for trunk/src/VBox

Timestamp:

Mar 4, 2010 2:43:59 PM (15 years ago)

Author:

vboxsync

Message:

r0drv/solaris/memobj-r0drv-solaris: some cleanup.

File:

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

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

@@ -312 +312 @@
 {
     PRTR0MEMOBJSOLARIS  pMemSolaris;
-    void               *pv;
-
-    /* Create the object. */
-    pMemSolaris = (PRTR0MEMOBJSOLARIS)rtR0MemObjNew(sizeof(*pMemSolaris), RTR0MEMOBJTYPE_RES_VIRT, pv, cb);
-    if (!pMemSolaris)
-        return VERR_NO_MEMORY;
 
     /*
      * Use xalloc.
      */
-    pv = vmem_xalloc(heap_arena, cb, uAlignment, 0 /*phase*/, 0 /*nocross*/,
+    void *pv = vmem_xalloc(heap_arena, cb, uAlignment, 0 /*phase*/, 0 /*nocross*/,
                      NULL /*minaddr*/, NULL /*maxaddr*/, VM_SLEEP);
     if (RT_UNLIKELY(!pv))
-    {
-        rtR0MemObjDelete(&pMemSolaris->Core);
+        return VERR_NO_MEMORY;
+
+    /* Create the object. */
+    pMemSolaris = (PRTR0MEMOBJSOLARIS)rtR0MemObjNew(sizeof(*pMemSolaris), RTR0MEMOBJTYPE_RES_VIRT, pv, cb);
+    if (!pMemSolaris)
+    {
+        LogRel(("rtR0MemObjNativeReserveKernel failed to alloc memory object.\n"));
+        vmem_xfree(heap_arena, pv, cb);
         return VERR_NO_MEMORY;
     }
@@ -357 +357 @@
 
     PRTR0MEMOBJSOLARIS pMemToMapSolaris = (PRTR0MEMOBJSOLARIS)pMemToMap;
-    size_t size = pMemToMapSolaris->Core.cb;
-    void *pv = pMemToMapSolaris->Core.pv;
-    pgcnt_t cPages = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
-    pgcnt_t iPage;
-    uint64_t *paddrs;
-    caddr_t addr;
-    int rc;
+    size_t cb        = pMemToMapSolaris->Core.cb;
+    void *pv         = pMemToMapSolaris->Core.pv;
+    pgcnt_t cPages   = (cb + PAGE_SIZE - 1) >> PAGE_SHIFT;
 
     /* Create the mapping object */
-    PRTR0MEMOBJSOLARIS pMemSolaris = (PRTR0MEMOBJSOLARIS)rtR0MemObjNew(sizeof(*pMemSolaris), RTR0MEMOBJTYPE_MAPPING, pv, size);
-    if (!pMemSolaris)
-        return VERR_NO_MEMORY;
-
-    paddrs = kmem_zalloc(sizeof(uint64_t) * cPages, KM_SLEEP);
-    for (iPage = 0; iPage < cPages; iPage++)
-    {
-        paddrs[iPage] = vbi_va_to_pa(pv);
-        if (paddrs[iPage] == -(uint64_t)1)
+    PRTR0MEMOBJSOLARIS pMemSolaris = (PRTR0MEMOBJSOLARIS)rtR0MemObjNew(sizeof(*pMemSolaris), RTR0MEMOBJTYPE_MAPPING, pv, cb);
+    if (!pMemSolaris)
+        return VERR_NO_MEMORY;
+
+    uint64_t *paPhysAddrs = kmem_zalloc(sizeof(uint64_t) * cPages, KM_SLEEP);
+    for (pgcnt_t iPage = 0; iPage < cPages; iPage++)
+    {
+        paPhysAddrs[iPage] = vbi_va_to_pa(pv);
+        if (RT_UNLIKELY(paPhysAddrs[iPage] == -(uint64_t)1))
         {
             LogRel(("rtR0MemObjNativeMapUser: no page to map.\n"));
-            kmem_free(paddrs, sizeof(uint64_t) * cPages);
+            kmem_free(paPhysAddrs, sizeof(uint64_t) * cPages);
             rtR0MemObjDelete(&pMemSolaris->Core);
             return VERR_MAP_FAILED;
@@ -384 +380 @@
     }
 
-    rc = vbi_user_map(&addr, fProt, paddrs, size);
+    caddr_t virtAddr = NULL;
+    int rc = vbi_user_map(&virtAddr, fProt, paPhysAddrs, cb);
     if (rc != 0)
     {
         LogRel(("rtR0MemObjNativeMapUser: vbi mapping failure.\n"));
-        kmem_free(paddrs, sizeof(uint64_t) * cPages);
+        kmem_free(paPhysAddrs, sizeof(uint64_t) * cPages);
         rtR0MemObjDelete(&pMemSolaris->Core);
         return VERR_MAP_FAILED;
@@ -396 +393 @@
 
     pMemSolaris->Core.u.Mapping.R0Process = (RTR0PROCESS)vbi_proc();
-    pMemSolaris->Core.pv = addr;
-    *ppMem = &pMemSolaris->Core;
-    kmem_free(paddrs, sizeof(uint64_t) * cPages);
+    pMemSolaris->Core.pv = virtAddr;
+    *ppMem = &pMemSolaris->Core;
+    kmem_free(paPhysAddrs, sizeof(uint64_t) * cPages);
     return rc;
 }