Changeset 4834 in vbox for trunk/src

Timestamp:

Sep 16, 2007 8:46:09 PM (17 years ago)

Author:

vboxsync

Message:

Unbroke solaris.

File:

• trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c (modified) (9 diffs)

trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c

@@ -40 +40 @@
 #include <iprt/initterm.h>
 #include <iprt/alloc.h>
+#include <iprt/string.h>
 
 
@@ -170 +171 @@
         ddi_soft_state_fini(&g_pVBoxDrvSolarisState);
 
+    cmn_err(CE_CONT, "VBoxDrvSolaris _init returns %d", e);
     return e;
 }
@@ -188 +190 @@
 {
     cmn_err(CE_CONT, "VBoxDrvSolaris _info");
-    return mod_info (&g_VBoxDrvSolarisModLinkage, pModInfo);
+    int e = mod_info (&g_VBoxDrvSolarisModLinkage, pModInfo);
+    cmn_err(CE_CONT, "VBoxDrvSolaris _info returns %d", e);
+    return e;
 }
 
@@ -501 +505 @@
 #ifndef IOCPARM_LEN
 # define IOCPARM_LEN(x)     ( ((x) >> 16) & IOCPARM_MASK )
-#endif 
+#endif
 
 
@@ -525 +529 @@
      * Read the header.
      */
-    if (RT_UNLIKELY(IOC_PARMLEN(iCmd) != sizeof(Hdr)))
-    {
-        OSDBGPRINT(("VBoxDrvSolarisIOCtlSlow: iCmd=%#x len %d expected %d\n", iCmd, IOC_PARMLEN(iCmd), sizeof(Hdr)));
+    if (RT_UNLIKELY(IOCPARM_LEN(iCmd) != sizeof(Hdr)))
+    {
+        OSDBGPRINT(("VBoxDrvSolarisIOCtlSlow: iCmd=%#x len %d expected %d\n", iCmd, IOCPARM_LEN(iCmd), sizeof(Hdr)));
         return EINVAL;
     }
-    rc = ddi_copyin(&Hdr, (void *)iArg, sizeof(Hdr), Mode);
+    rc = ddi_copyin((void *)iArg, &Hdr, sizeof(Hdr), Mode);
     if (RT_UNLIKELY(rc))
     {
@@ -544 +548 @@
     if (RT_UNLIKELY(    Hdr.cbIn < sizeof(Hdr)
                     ||  Hdr.cbOut < sizeof(Hdr)
-                    ||  cbReq > _1M*16))
+                    ||  cbBuf > _1M*16))
     {
         OSDBGPRINT(("VBoxDrvSolarisIOCtlSlow: max(%#x,%#x); iCmd=%#x\n", Hdr.cbIn, Hdr.cbOut, iCmd));
@@ -559 +563 @@
         return ENOMEM;
     }
-    rc = ddi_copyin(pHdr, (void *)iArg, cbBuf, Mode);
+    rc = ddi_copyin((void *)iArg, pHdr, cbBuf, Mode);
     if (RT_UNLIKELY(rc))
     {
@@ -570 +574 @@
      * Process the IOCtl.
      */
-    rc = supdrvIOCtl(Cmd, &g_DevExt, pSession, pHdr);
+    rc = supdrvIOCtl(iCmd, &g_DevExt, pSession, pHdr);
 
     /*
@@ -661 +665 @@
 
     va_start(args, pszFormat);
-    vsnprintf(szMsg, sizeof(szMsg) - 1, pszFormat, args);
+    RTStrPrintfV(szMsg, sizeof(szMsg) - 1, pszFormat, args);
     va_end(args);
 
     szMsg[sizeof(szMsg) - 1] = '\0';
-    uprintf("%s", szMsg);
+    uprintf("SUPR0Printf: %s", szMsg);
     return 0;
 }
+