Changeset 6345 in vbox

Timestamp:

Jan 11, 2008 5:28:00 PM (17 years ago)

Author:

vboxsync

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

27247

Message:

Solaris Guest driver: Fixed ioctl numbering, implemented VBOXGUEST_IOCTL_LOG.

Location:

trunk

Files:

• include/VBox/VBoxGuest.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c (modified) (2 diffs)

trunk/include/VBox/VBoxGuest.h

@@ -977 +977 @@
 # define VBOXGUEST_IOCTL_CODE(Function, Size)   _IOWRN('V', (Function) | VBOXGUEST_IOCTL_FLAG, (Size))
 # define VBOXGUEST_IOCTL_CODE_FAST(Function)    _IO(  'V', (Function) | VBOXGUEST_IOCTL_FLAG)
+
+# define VBOXGUEST_IOCTL_SIZE(Code)             (((Code) >> 16) & IOCPARM_MASK)
+# define VBOXGUEST_IOCTL_NUMBER(Code)           ((Code) & IOCPARM_MASK)
 
 #elif 0 /* BSD style - needs some adjusting _IORW takes a type and not a size. */

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c

@@ -733 +733 @@
     int rc = 0;
     int requestType = 0;
-    if (    Cmd >= VBOXGUEST_IOCTL_VMMREQUEST(0)
-        &&  Cmd <= VBOXGUEST_IOCTL_VMMREQUEST(0xfff))
+    if (VBOXGUEST_IOCTL_NUMBER(Cmd) == VBOXGUEST_IOCTL_NUMBER(VBOXGUEST_IOCTL_VMMREQUEST(0)))
     {
         cbBuf = sizeof(VMMDevRequestHeader);
         requestType = 1;
-        LogFlow((DEVICE_NAME ":VBOXGUEST_IOCTL_VMMREQUEST"));
+        LogFlow((DEVICE_NAME ":VBOXGUEST_IOCTL_VMMREQUEST\n"));
     }
 #ifdef VBOX_HGCM
-    else if (   Cmd >= VBOXGUEST_IOCTL_HGCM_CALL(0)
-             && Cmd <= VBOXGUEST_IOCTL_HGCM_CALL(0xfff))
+    else if (VBOXGUEST_IOCTL_NUMBER(Cmd) == VBOXGUEST_IOCTL_NUMBER(VBOXGUEST_IOCTL_HGCM_CALL(0)))
     {
         cbBuf = sizeof(VBoxGuestHGCMCallInfo);
-        LogFlow((DEVICE_NAME ":VBOXGUEST_IOCTL_HGCM_CALL"));
+        requestType = 2;
+        LogFlow((DEVICE_NAME ":VBOXGUEST_IOCTL_HGCM_CALL", Cmd));
     }
 #endif /* VBOX_HGCM */
+    else if (VBOXGUEST_IOCTL_NUMBER(Cmd) == VBOXGUEST_IOCTL_NUMBER(VBOXGUEST_IOCTL_LOG(0)))
+    {
+        /** Untested Code. Will be tested soon. */
+        cbBuf = VBOXGUEST_IOCTL_SIZE(Cmd);
+        LogFlow((DEVICE_NAME ":VBOXGUEST_IOCTL_LOG Cmd=%d cbBuf=%d", Cmd, cbBuf));        
+        char* pszLogMsg = RTMemTmpAlloc(cbBuf);
+        if (RT_UNLIKELY(!pszLogMsg))
+        {
+            LogRel((DEVICE_NAME ":RTMemAlloc failed to alloc %d bytes\n", cbBuf));
+            return ENOMEM;
+        }
+        rc = ddi_copyin((void *)pArg, pszLogMsg, cbBuf, Mode);
+        if (rc == 0)
+            Log(("%.*s", cbBuf, pszLogMsg));
+        else
+            LogRel((DEVICE_NAME ":ddi_copyin failed. rc=%d\n", rc));
+        RTMemTmpFree(pszLogMsg);
+    }
     else
     {
@@ -803 +820 @@
     {
         VMMDevRequestHeader Hdr;
-        rc = ddi_copyin((void*)pArg, &Hdr, sizeof(Hdr), Mode);
+        rc = ddi_copyin((void *)pArg, &Hdr, sizeof(Hdr), Mode);
         if (RT_UNLIKELY(rc))
         {