Changeset 25183 in vbox for trunk/src/VBox/Runtime/r0drv

Timestamp:

Dec 4, 2009 11:03:05 AM (15 years ago)

Author:

vboxsync

Message:

r0drv/Solaris: fix warnings.

Location:

trunk/src/VBox/Runtime/r0drv/solaris

Files:

• semevent-r0drv-solaris.c (modified) (1 diff)
• semeventmulti-r0drv-solaris.c (modified) (1 diff)
• vbi/alloc-r0drv-solaris.c (modified) (1 diff)
• vbi/i86pc/os/vbi.c (modified) (6 diffs)
• vbi/i86pc/sys/vbi.h (modified) (2 diffs)
• vbi/mp-r0drv-solaris.c (modified) (2 diffs)
• vbi/thread-r0drv-solaris.c (modified) (1 diff)
• vbi/timer-r0drv-solaris.c (modified) (1 diff)

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

@@ -211 +211 @@
         {
             clock_t cTicks = drv_usectohz((clock_t)(cMillies * 1000L));
-            clock_t timeout = ddi_get_lbolt();
-            timeout += cTicks;
+            clock_t cTimeout = ddi_get_lbolt();
+            cTimeout += cTicks;
             if (fInterruptible)
-                rc = cv_timedwait_sig(&pEventInt->Cnd, &pEventInt->Mtx, timeout);
+                rc = cv_timedwait_sig(&pEventInt->Cnd, &pEventInt->Mtx, cTimeout);
             else
-                rc = cv_timedwait(&pEventInt->Cnd, &pEventInt->Mtx, timeout);
+                rc = cv_timedwait(&pEventInt->Cnd, &pEventInt->Mtx, cTimeout);
         }
         else

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

@@ -237 +237 @@
         {
             clock_t cTicks = drv_usectohz((clock_t)(cMillies * 1000L));
-            clock_t timeout = ddi_get_lbolt();
-            timeout += cTicks;
+            clock_t cTimeout = ddi_get_lbolt();
+            cTimeout += cTicks;
             if (fInterruptible)
-                rc = cv_timedwait_sig(&pThis->Cnd, &pThis->Mtx, timeout);
+                rc = cv_timedwait_sig(&pThis->Cnd, &pThis->Mtx, cTimeout);
             else
-                rc = cv_timedwait(&pThis->Cnd, &pThis->Mtx, timeout);
+                rc = cv_timedwait(&pThis->Cnd, &pThis->Mtx, cTimeout);
         }
         else

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

@@ -71 +71 @@
     }
     else
-        printf("rtMemAlloc(%#x, %#x) failed\n", cb + sizeof(*pHdr), fFlags);
+        cmn_err(CE_NOTE, "rtMemAlloc(%ld, %x) failed\n", cb + sizeof(*pHdr), fFlags);
     return pHdr;
 }

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

@@ -111 +111 @@
  * module linkage stuff
  */
+#if 0
 static struct modlmisc vbi_modlmisc = {
         &mod_miscops, "VirtualBox Interfaces V6"
@@ -116 +117 @@
 
 static struct modlinkage vbi_modlinkage = {
-        MODREV_1, (void *)&vbi_modlmisc, NULL
+        MODREV_1, { (void *)&vbi_modlmisc, NULL }
 };
+#endif
 
 extern uintptr_t kernelbase;
@@ -201 +203 @@
 vbi_init(void)
 {
-        int err;
-
         /*
          * Check to see if this version of virtualbox interface module will work
@@ -988 +988 @@
 
 static int
-vbi_watcher(cpu_setup_t state, int cpu, void *arg)
+vbi_watcher(cpu_setup_t state, int icpu, void *arg)
 {
         vbi_cpu_watch_t *w = arg;
@@ -999 +999 @@
         else
                 return (0);
-        w->vbi_cpu_func(w->vbi_cpu_arg, cpu, online);
+        w->vbi_cpu_func(w->vbi_cpu_arg, icpu, online);
         return (0);
 }
@@ -1122 +1122 @@
  */
 static void
-vbi_gtimer_online(void *arg, cpu_t *cpu, cyc_handler_t *h, cyc_time_t *ct)
+vbi_gtimer_online(void *arg, cpu_t *pcpu, cyc_handler_t *h, cyc_time_t *ct)
 {
         vbi_gtimer_t *t = arg;
         hrtime_t now;
 
-        t->g_counters[cpu->cpu_id] = 0;
+        t->g_counters[pcpu->cpu_id] = 0;
         h->cyh_func = vbi_gtimer_func;
         h->cyh_arg = t;

trunk/src/VBox/Runtime/r0drv/solaris/vbi/i86pc/sys/vbi.h

@@ -230 +230 @@
  *
  * The call back func is invoked with 3 arguments:
- *      void func(void *arg, int cpu, int online);
+ *      void func(void *arg, int icpu, int online);
  * - arg is passed through from vbi_watch_cpus()
  * - cpu is the CPU id involved
@@ -277 +277 @@
 typedef struct vbi_stimer vbi_stimer_t;
 extern vbi_stimer_t *vbi_stimer_begin(void (*func)(void *, uint64_t), void *arg,
-    uint64_t when, uint64_t interval, int cpu);
+    uint64_t when, uint64_t interval, int icpu);
 extern void vbi_stimer_end(vbi_stimer_t *);
 #pragma weak vbi_stimer_begin

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

@@ -228 +228 @@
 RTDECL(int) RTMpOnOthers(PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2)
 {
-    int rc;
     RTMPARGS Args;
     RT_ASSERT_INTS_ON();
@@ -275 +274 @@
 RTDECL(int) RTMpOnSpecific(RTCPUID idCpu, PFNRTMPWORKER pfnWorker, void *pvUser1, void *pvUser2)
 {
-    int rc;
     RTMPARGS Args;
     RT_ASSERT_INTS_ON();

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

@@ -53 +53 @@
 {
     clock_t cTicks;
-    unsigned long timeout;
     RT_ASSERT_PREEMPTIBLE();
 

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

@@ -197 +197 @@
     else
     {
-        int cpu = VBI_ANY_CPU;
+        int iCpu = VBI_ANY_CPU;
         if (pTimer->fSpecificCpu)
-            cpu = pTimer->iCpu;
-        pTimer->stimer = vbi_stimer_begin(rtTimerSolarisCallbackWrapper, pTimer, u64First, pTimer->interval, cpu);
+            iCpu = pTimer->iCpu;
+        pTimer->stimer = vbi_stimer_begin(rtTimerSolarisCallbackWrapper, pTimer, u64First, pTimer->interval, iCpu);
         if (pTimer->stimer == NULL)
         {
-            if (cpu != VBI_ANY_CPU)
+            if (iCpu != VBI_ANY_CPU)
                 return VERR_CPU_OFFLINE;
             return VERR_INVALID_PARAMETER;