Changeset 19338 in vbox

Timestamp:

May 4, 2009 4:48:14 PM (16 years ago)

Author:

vboxsync

Message:

3880 VirtualBox and Solaris build 114 - don't use curproc

Location:

trunk/src/VBox/Runtime/r0drv/solaris

Files:

• process-r0drv-solaris.c (modified) (2 diffs)
• thread2-r0drv-solaris.c (modified) (1 diff)
• vbi/32/vbi (modified) ( previous)
• vbi/64/vbi (modified) ( previous)
• vbi/i86pc/os/vbi.c (modified) (8 diffs)

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

@@ -39 +39 @@
 RTDECL(RTPROCESS) RTProcSelf(void)
 {
-    /* use ddi_get_pid()? */
-    struct pid *pPidInfo = curproc->p_pidp;
-    return pPidInfo->pid_id;
+    pid_t pid = -1;
+    drv_getparm(PPID, &pid);
+    return (RTPROCESS)pid;
 }
 
@@ -47 +47 @@
 RTR0DECL(RTR0PROCESS) RTR0ProcHandleSelf(void)
 {
-    return (RTR0PROCESS)curproc;
+    proc_t *p = NULL;
+    drv_getparm(UPROCP, &p);
+    return (RTR0PROCESS)p;
 }
 

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

@@ -103 +103 @@
     int rc;
     kthread_t* pKernThread = thread_create(NULL, NULL, rtThreadNativeMain, pThreadInt, 0,
-                                           curproc, TS_RUN, minclsyspri);
+                                           (void *)RTR0ProcHandleSelf(), TS_RUN, minclsyspri);
     if (pKernThread)
     {

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

@@ -59 +59 @@
 #include "vbi.h"
 
+#define VBIPROC() ((proc_t *)vbi_proc())
+
 /*
  * We have to use dl_lookup to find contig_free().
@@ -254 +256 @@
                 vmem_free(heap_arena, va, size);
         } else {
-                struct as *as = curproc->p_as;
+                struct as *as = VBIPROC()->p_as;
 
                 as_rangelock(as);
@@ -379 +381 @@
 vbi_proc(void)
 {
-        return (curproc);
+        proc_t *p;
+        drv_getparm(UPROCP, &p);
+        return (p);
 }
 
@@ -398 +402 @@
 
         t = thread_create(NULL, NULL, (void (*)())func, arg, len,
-            curproc, TS_RUN, priority);
+            VBIPROC(), TS_RUN, priority);
         return (t);
 }
@@ -542 +546 @@
         *handle = NULL;
         if (!IS_KERNEL(addr)) {
-                err = as_fault(curproc->p_as->a_hat, curproc->p_as,
+                err = as_fault(VBIPROC()->p_as->a_hat, VBIPROC()->p_as,
                     (caddr_t)addr, len, F_SOFTLOCK, S_WRITE);
                 if (err != 0) {
@@ -557 +561 @@
 {
         if (!IS_KERNEL(addr))
-                as_fault(curproc->p_as->a_hat, curproc->p_as, (caddr_t)addr,
-                    len, F_SOFTUNLOCK, S_WRITE);
+                as_fault(VBIPROC()->p_as->a_hat, VBIPROC()->p_as,
+                    (caddr_t)addr, len, F_SOFTUNLOCK, S_WRITE);
 }
 
@@ -571 +575 @@
                 hat = kas.a_hat;
         else
-                hat = curproc->p_as->a_hat;
+                hat = VBIPROC()->p_as->a_hat;
         pfn = hat_getpfnum(hat, (caddr_t)(v & PAGEMASK));
         if (pfn == PFN_INVALID)
@@ -825 +829 @@
 vbi_user_map(caddr_t *va, uint_t prot, uint64_t *palist, size_t len)
 {
-        struct as *as = curproc->p_as;
+        struct as *as = VBIPROC()->p_as;
         struct segvbi_crargs args;
         int error = 0;