Changeset 32919 in vbox for trunk/src/VBox/Runtime/r0drv/solaris

Timestamp:

Oct 5, 2010 1:41:35 PM (14 years ago)

Author:

vboxsync

Message:

nits

Location:

trunk/src/VBox/Runtime/r0drv/solaris/vbi

Files:

• i86pc/os/vbi.c (modified) (1 diff)
• memobj-r0drv-solaris.c (modified) (5 diffs)

trunk/src/VBox/Runtime/r0drv/solaris/vbi/i86pc/os/vbi.c

@@ -1303 +1303 @@
                                 /*
                                  * get pages from kseg, the 'virtAddr' here is only for colouring but unforuntately
-                                 * we dont' have the 'virtAddr' to which this memory may be mapped.
+                                 * we don't have the 'virtAddr' to which this memory may be mapped.
                                  */
                                 seg_t kernseg;

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

@@ -179 +179 @@
     uint64_t physAddr = PhysHighest;
 
-#if 0
+# if 0
     /*
      * The contig_alloc() way of allocating NC pages is broken or does not match our semantics. Refer #4716 for details.
      */
-#if 0
+#  if 0
     /* caddr_t virtAddr  = vbi_phys_alloc(&physAddr, cb, PAGE_SIZE, 0 /* non-contiguous */);
-#endif
+#  endif
     caddr_t virtAddr = ddi_umem_alloc(cb, DDI_UMEM_SLEEP, &pMemSolaris->Cookie);
     if (RT_UNLIKELY(virtAddr == NULL))
@@ -196 +196 @@
     pMemSolaris->Core.u.Phys.fAllocated = true;
     pMemSolaris->pvHandle = NULL;
-#else
+# else
     void *pvPages = vbi_pages_alloc(&physAddr, cb);
     if (!pvPages)
@@ -208 +208 @@
     pMemSolaris->Core.u.Phys.fAllocated = false;
     pMemSolaris->pvHandle = pvPages;
-#endif
+# endif
 
     Assert(!(physAddr & PAGE_OFFSET_MASK));
@@ -456 +456 @@
         return VERR_MAP_FAILED;
     }
-    else
-        rc = VINF_SUCCESS;
 
     pMemSolaris->Core.u.Mapping.R0Process = (RTR0PROCESS)vbi_proc();
@@ -463 +461 @@
     *ppMem = &pMemSolaris->Core;
     kmem_free(paPhysAddrs, sizeof(uint64_t) * cPages);
-    return rc;
+    return VINF_SUCCESS;
 }