儲存庫 vbox 的更動 16722

時間撮記:

2009-2-13 上午12:37:20 (16 年 以前)

作者:

vboxsync

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

42758

訊息:

runtime fix for solaris shared folders

檔案:

• trunk/src/VBox/Runtime/r0drv/solaris/memobj-r0drv-solaris.c (修改) (2 筆差異)

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

@@ -114 +114 @@
         {
             struct as *addrSpace;
-            if (pMemSolaris->Core.u.Lock.R0Process != NIL_RTR0PROCESS)
+            if ((uintptr_t)pMemSolaris->Core.pv < kernelbase)
             {
                 addrSpace = ((proc_t *)pMemSolaris->Core.u.Lock.R0Process)->p_as;
@@ -272 +272 @@
 
     /* Lock down user pages */
-    int rc = as_pagelock(useras, &ppl, (caddr_t)R3Ptr, cb, S_WRITE);
-    if (!rc)
-    {
-        if (ppl)
-        {
-            pMemSolaris->Core.u.Lock.R0Process = (RTR0PROCESS)userproc;
-            pMemSolaris->ppShadowPages = ppl;
-            *ppMem = &pMemSolaris->Core;
-            return VINF_SUCCESS;
-        }
-
-        as_pageunlock(useras, ppl, (caddr_t)R3Ptr, cb, S_WRITE);
-        cmn_err(CE_NOTE, "rtR0MemObjNativeLockUser: as_pagelock failed to get shadow pages\n");
-    }
+    int rc;
+    ppl = NULL;
+    if ((uintptr_t)R3Ptr < kernelbase)
+        rc = as_pagelock(useras, &ppl, (caddr_t)R3Ptr, cb, S_WRITE);
     else
-        cmn_err(CE_NOTE,"rtR0MemObjNativeLockUser: as_pagelock failed rc=%d\n", rc);
+        rc = 0;
+    if (rc == 0)
+    {
+        pMemSolaris->Core.u.Lock.R0Process = (RTR0PROCESS)userproc;
+        pMemSolaris->ppShadowPages = ppl;
+        *ppMem = &pMemSolaris->Core;
+        return VINF_SUCCESS;
+    }
+
+    cmn_err(CE_NOTE,"rtR0MemObjNativeLockUser: as_pagelock failed rc=%d\n", rc);
     rtR0MemObjDelete(&pMemSolaris->Core);
     return VERR_LOCK_FAILED;