Changeset 21633 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jul 16, 2009 9:30:14 AM (16 years ago)

Author:

vboxsync

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

50163

Message:

vbi/memobj-r0drv-solaris.c: reserving kernel address space. (Same as r50146.) Fixes #4110.

File:

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

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

@@ -89 +89 @@
             break;
 
+        case RTR0MEMOBJTYPE_RES_VIRT:
+        {
+            if (pMemSolaris->Core.u.ResVirt.R0Process == NIL_RTR0PROCESS)
+                vmem_xfree(heap_arena, pMemSolaris->Core.pv, pMemSolaris->Core.cb);
+            else
+                AssertFailed();
+            break;
+        }
+
         /* unused */
         case RTR0MEMOBJTYPE_PHYS:
-        case RTR0MEMOBJTYPE_RES_VIRT:
         default:
             AssertMsgFailed(("enmType=%d\n", pMemSolaris->Core.enmType));
@@ -253 +261 @@
 int rtR0MemObjNativeReserveKernel(PPRTR0MEMOBJINTERNAL ppMem, void *pvFixed, size_t cb, size_t uAlignment)
 {
-    return VERR_NOT_IMPLEMENTED;
+    PRTR0MEMOBJSOLARIS  pMemSolaris;
+    void               *pv;
+
+    /*
+     * Use xalloc.
+     */
+    pv = vmem_xalloc(heap_arena, cb, uAlignment, 0 /*phase*/, 0 /*nocross*/,
+                     NULL /*minaddr*/, NULL /*maxaddr*/, VM_SLEEP);
+    if (!pv)
+        return VERR_NO_MEMORY;
+    pMemSolaris = (PRTR0MEMOBJSOLARIS)rtR0MemObjNew(sizeof(*pMemSolaris), RTR0MEMOBJTYPE_RES_VIRT, pv, cb);
+    if (!pMemSolaris)
+    {
+        vmem_xfree(heap_arena, pv, cb);
+        return VERR_NO_MEMORY;
+    }
+
+    pMemSolaris->Core.u.ResVirt.R0Process = NIL_RTR0PROCESS;
+    *ppMem = &pMemSolaris->Core;
+    return VINF_SUCCESS;
 }
 
@@ -268 +295 @@
     return VERR_NOT_IMPLEMENTED;
 }
+
 
 int rtR0MemObjNativeMapUser(PPRTR0MEMOBJINTERNAL ppMem, PRTR0MEMOBJINTERNAL pMemToMap, RTR3PTR R3PtrFixed, size_t uAlignment, unsigned fProt, RTR0PROCESS R0Process)