Changeset 6436 in vbox for trunk/src/VBox/Additions

Timestamp:

Jan 22, 2008 9:24:56 AM (17 years ago)

Author:

vboxsync

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

27404

Message:

Handle logging ioctl in VBoxGuest.

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• VBoxGuest-solaris.c (modified) (1 diff)
• VBoxGuest.cpp (modified) (3 diffs)

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

@@ -798 +798 @@
             cbDataReturned = cbBuf;
         }
-        rc = ddi_copyout(pvBuf, (void *)(uintptr_t)ReqWrap.pvDataR3, cbDataReturned, Mode);
-        if (RT_UNLIKELY(rc))
-        {
-            Log((DEVICE_NAME ":VBoxAddSolarisIOCtl: ddi_copyout failed; pvBuf=%p pArg=%p Cmd=%d. rc=%d\n", pvBuf, pArg, Cmd, rc));
-            rc = EFAULT;
+        if (cbDataReturned > 0)
+        {
+            rc = ddi_copyout(pvBuf, (void *)(uintptr_t)ReqWrap.pvDataR3, cbDataReturned, Mode);
+            if (RT_UNLIKELY(rc))
+            {
+                Log((DEVICE_NAME ":VBoxAddSolarisIOCtl: ddi_copyout failed; pvBuf=%p pArg=%p Cmd=%d. rc=%d\n", pvBuf, pArg, Cmd, rc));
+                rc = EFAULT;
+            }
         }
     }

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp

@@ -1091 +1091 @@
 
 /**
+ * Guest backdoor logging.
+ *
+ * @returns VBox status code.
+ *
+ * @param   pch                 The log message (need not be NULL terminated).
+ * @param   cbData              Size of the buffer.
+ * @param   pcbDataReturned     Where to store the amount of returned data. Can be NULL.
+ */
+static int VBoxGuestCommonIOCtl_Log(char *pch, size_t cbData, size_t *pcbDataReturned)
+{
+    Log(("%.*s\n", cbData, pch));
+    if (pcbDataReturned)
+        *pcbDataReturned = 0;
+    return VINF_SUCCESS;
+}
+
+
+/**
  * Common IOCtl for user to kernel and kernel to kernel communcation.
  *
@@ -1158 +1176 @@
     }
 #endif /* VBOX_HGCM */
+    else if (VBOXGUEST_IOCTL_STRIP_SIZE(iFunction) == VBOXGUEST_IOCTL_STRIP_SIZE(VBOXGUEST_IOCTL_LOG(0)))
+    {
+        CHECKRET_MIN_SIZE("LOG", 1);
+        rc = VBoxGuestCommonIOCtl_Log((char *)pvData, cbData, pcbDataReturned);
+    }
     else
     {
@@ -1189 +1212 @@
                 rc = VBoxGuestCommonIOCtl_HGCMDisconnect(pDevExt, pSession, (VBoxGuestHGCMDisconnectInfo *)pvData, pcbDataReturned);
                 break;
-
 
             case VBOXGUEST_IOCTL_CLIPBOARD_CONNECT: