Changeset 4996 in vbox

Timestamp:

Sep 24, 2007 9:31:35 AM (17 years ago)

Author:

vboxsync

Message:

Fix logging in src/VBox/Additions/linux/module/hgcmcall.c

File:

• trunk/src/VBox/Additions/linux/module/hgcmcall.c (modified) (15 diffs)

trunk/src/VBox/Additions/linux/module/hgcmcall.c

@@ -43 +43 @@
     if (!hgcmR3)
     {
-        elog("IOCTL_VBOXGUEST_HGCM_CALL: cannot allocate memory!\n");
-        Log(("IOCTL_VBOXGUEST_HGCM_CALL: cannot allocate memory!\n"));
+        LogRel(("IOCTL_VBOXGUEST_HGCM_CALL: cannot allocate memory!\n"));
         return -ENOMEM;
     }
@@ -50 +49 @@
     if (copy_from_user(hgcmR3, pUser, sizeof(*hgcmR3) + cParms * sizeof(HGCMFunctionParameter)))
     {
-        elog("IOCTL_VBOXGUEST_HGCM_CALL: copy_from_user failed!\n");
-        Log(("IOCTL_VBOXGUEST_HGCM_CALL: copy_from_user failed!\n"));
+        LogRel(("IOCTL_VBOXGUEST_HGCM_CALL: copy_from_user failed!\n"));
         kfree(hgcmR3);
         return -EFAULT;
@@ -83 +81 @@
     if (!hgcmR0)
     {
-        elog("IOCTL_VBOXGUEST_HGCM_CALL: cannot allocate memory!\n");
-        Log(("IOCTL_VBOXGUEST_HGCM_CALL: cannot allocate memory!\n"));
+        LogRel(("IOCTL_VBOXGUEST_HGCM_CALL: cannot allocate memory!\n"));
         return -ENOMEM;
     }
@@ -105 +102 @@
             break;
         default:
-            elog("IOCTL_VBOXGUEST_HGCM_CALL: unsupported or unknown parameter type\n");
-            Log(("IOCTL_VBOXGUEST_HGCM_CALL: unsupported or unknown parameter type\n"));
+            LogRel(("IOCTL_VBOXGUEST_HGCM_CALL: unsupported or unknown parameter type\n"));
             kfree(hgcmR0);
             return -EINVAL;
@@ -115 +111 @@
     if (pu8PointerData == NULL)
     {
-        elog("IOCTL_VBOXGUEST_HGCM_CALL: out of memory allocating %d bytes for pointer data\n",
-                cbPointerData);
-        Log(("IOCTL_VBOXGUEST_HGCM_CALL: out of memory allocating %d bytes for pointer data\n",
+        LogRel(("IOCTL_VBOXGUEST_HGCM_CALL: out of memory allocating %d bytes for pointer data\n",
                 cbPointerData));
         kfree(hgcmR0);
@@ -140 +134 @@
                                 VBOXGUEST_HGCM_CALL_PARMS(hgcmR3)[i].u.Pointer.size))
             {
-                elog("IOCTL_VBOXGUEST_HGCM_CALL: copy_from_user failed!\n");
-                Log(("IOCTL_VBOXGUEST_HGCM_CALL: copy_from_user failed!\n"));
+                LogRel(("IOCTL_VBOXGUEST_HGCM_CALL: copy_from_user failed!\n"));
                 kfree(hgcmR0);
                 kfree(pu8PointerData);
@@ -175 +168 @@
 
 /**
- * Dump the contents of an hgcm call info structure to the system log and to the back door logger
- * if it is active.
+ * Dump the contents of an hgcm call info structure to the back door logger
  *
  * @param hgcmR0 The structure to dump.
@@ -190 +182 @@
         {
         case VMMDevHGCMParmType_32bit:
-            elog("IOCTL_VBOXGUEST_HGCM_CALL: parameter %d is of type 32bit: %u\n",
-                  i, VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.value32);
             Log(("IOCTL_VBOXGUEST_HGCM_CALL: parameter %d is of type 32bit: %u\n",
                   i, VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.value32));
             break;
         case VMMDevHGCMParmType_64bit:
-            elog("IOCTL_VBOXGUEST_HGCM_CALL: parameter %d is of type 64bit: %lu\n",
-                  i, VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.value64);
             Log(("IOCTL_VBOXGUEST_HGCM_CALL: parameter %d is of type 64bit: %lu\n",
                   i, VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.value64));
             break;
         case VMMDevHGCMParmType_LinAddr:
-            elog("IOCTL_VBOXGUEST_HGCM_CALL: parameter %d is of type LinAddr, size %u: %.*s...\n",
-                  i,
-                  VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.Pointer.size > 10 ?
-                      VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.Pointer.size : 10,
-                  VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.Pointer.u.linearAddr,
-                  VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.Pointer.size);
             Log(("IOCTL_VBOXGUEST_HGCM_CALL: parameter %d is of type LinAddr, size %u: %.*s...\n",
                   i,
@@ -216 +198 @@
             break;
         case VMMDevHGCMParmType_LinAddr_In:
-            elog("IOCTL_VBOXGUEST_HGCM_CALL: parameter %d is of type LinAddr_In, size %u: %.*s...\n",
-                  i,
-                  VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.Pointer.size > 10 ?
-                      VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.Pointer.size : 10,
-                  VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.Pointer.u.linearAddr,
-                  VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.Pointer.size);
             Log(("IOCTL_VBOXGUEST_HGCM_CALL: parameter %d is of type LinAddr_In, size %u: %.*s...\n",
                   i,
@@ -230 +206 @@
             break;
         case VMMDevHGCMParmType_LinAddr_Out:
-            elog("IOCTL_VBOXGUEST_HGCM_CALL: parameter %d is of type LinAddr_Out, size %u: %.*s...\n",
-                  i,
-                  VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.Pointer.size > 10 ?
-                      VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.Pointer.size : 10,
-                  VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.Pointer.u.linearAddr,
-                  VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.Pointer.size);
             Log(("IOCTL_VBOXGUEST_HGCM_CALL: parameter %d is of type LinAddr_Out, size %u: %.*s...\n",
                   i,
@@ -244 +214 @@
             break;
         default:
-            elog("IOCTL_VBOXGUEST_HGCM_CALL: parameter %d is of unknown type!", i);
             Log(("IOCTL_VBOXGUEST_HGCM_CALL: parameter %d is of unknown type!", i));
         }
@@ -279 +248 @@
                               VBOXGUEST_HGCM_CALL_PARMS(hgcmR0)[i].u.Pointer.size))
             {
-                elog("IOCTL_VBOXGUEST_HGCM_CALL: copy_to_user failed!\n");
-                Log(("IOCTL_VBOXGUEST_HGCM_CALL: copy_to_user failed!\n"));
+                LogRel(("IOCTL_VBOXGUEST_HGCM_CALL: copy_to_user failed!\n"));
                 return -EFAULT;
             }
@@ -298 +266 @@
                      sizeof(*hgcmR3) + hgcmR3->cParms * sizeof(HGCMFunctionParameter)))
     {
-        elog("IOCTL_VBOXGUEST_HGCM_CALL: copy_to_user failed!\n");
-        Log(("IOCTL_VBOXGUEST_HGCM_CALL: copy_to_user failed!\n"));
+        LogRel(("IOCTL_VBOXGUEST_HGCM_CALL: copy_to_user failed!\n"));
         return -EFAULT;
     }
@@ -327 +294 @@
     if (copy_from_user(&callHeader, (void*)arg, sizeof(callHeader)))
     {
-        elog("IOCTL_VBOXGUEST_HGCM_CALL: copy_from_user failed!\n");
-        Log(("IOCTL_VBOXGUEST_HGCM_CALL: copy_from_user failed!\n"));
+        LogRel(("IOCTL_VBOXGUEST_HGCM_CALL: copy_from_user failed!\n"));
         return -EFAULT;
     }
@@ -352 +318 @@
     if (VBOX_FAILURE(rc))
     {
-        elog("IOCTL_VBOXGUEST_HGCM_CALL: internal ioctl call failed, rc=%d\n", rc);
-        Log(("IOCTL_VBOXGUEST_HGCM_CALL: internal ioctl call failed, rc=%d\n", rc));
-        /** @todo We need a function to convert VBox error codes back to Linux. */
-        rc = -EINVAL;
+        LogRel(("IOCTL_VBOXGUEST_HGCM_CALL: internal ioctl call failed, rc=%Vrc\n", rc));
+        rc = -RTErrConvertToErrno(rc);
     }
     else