Changeset 18315 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Mar 26, 2009 2:24:57 PM (16 years ago)

Author:

vboxsync

Message:

Additions/linux/vboxadd: use our own error conversion function to avoid assertions

File:

• trunk/src/VBox/Additions/linux/module/vboxmod.c (modified) (5 diffs)

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

@@ -130 +130 @@
 };
 
+
+/**
+ * This function converts a VBox result code into a Linux error number.
+ * Note that we return 0 (success) for all informational values, as Linux
+ * has no such concept.
+ */
+static int vboxadd_convert_result(int vbox_err)
+{
+    if (   vbox_err > -1000
+        && vbox_err < 1000)
+        return RTErrConvertToErrno(vbox_err);
+    switch (vbox_err)
+    {
+        case VERR_HGCM_SERVICE_NOT_FOUND:      return ESRCH;
+        case VINF_HGCM_CLIENT_REJECTED:        return 0;
+        case VERR_HGCM_INVALID_CMD_ADDRESS:    return EFAULT;
+        case VINF_HGCM_ASYNC_EXECUTE:          return 0;
+        case VERR_HGCM_INTERNAL:               return EPROTO;
+        case VERR_HGCM_INVALID_CLIENT_ID:      return EINVAL;
+        case VINF_HGCM_SAVE_STATE:             return 0;
+        /* No reason to return this to a guest */
+        // case VERR_HGCM_SERVICE_EXISTS:         return EEXIST;
+    }
+    AssertMsgFailedReturn(("Unhandled error code %Rrc\n", vbox_err), EPROTO);
+}
+
 /**
  * Register an HGCM connection as being connected with a given file descriptor, so that it
@@ -324 +350 @@
         int vrc = vboxadd_cmc_call(vboxDev, VBOXGUEST_IOCTL_HGCM_CONNECT,
                                     &info);
-        rc = RT_FAILURE(vrc) ? -RTErrConvertToErrno(vrc)
-                             : -RTErrConvertToErrno(info.result);
+        rc = RT_FAILURE(vrc) ? -vboxadd_convert_result(vrc)
+                             : -vboxadd_convert_result(info.result);
         if (rc < 0)
             LogFunc(("hgcm connection failed.  internal ioctl result %Rrc, hgcm result %Rrc\n",
@@ -383 +409 @@
     {
         vrc = vboxadd_cmc_call(vboxDev, VBOXGUEST_IOCTL_HGCM_DISCONNECT, &info);
-        rc = -RTErrConvertToErrno(vrc);
+        rc = -vboxadd_convert_result(vrc);
+        if (rc < 0)
+            LogFunc(("HGCM disconnect failed, error %Rrc\n", vrc));
     }
     if (   rc >= 0
@@ -596 +624 @@
         vrc = vboxadd_cmc_call(vboxDev,
                                VBOXGUEST_IOCTL_HGCM_CALL(u32Size), pInfo);
-        rc = -RTErrConvertToErrno(vrc);
+        rc = -vboxadd_convert_result(vrc);
+        if (rc < 0)
+            LogFunc(("HGCM call failed, error %Rrc\n", vrc));
         if (   rc >= 0
             && copy_to_user ((void *)userspace_info, (void *)pInfo,
@@ -661 +691 @@
         vrc = vboxadd_cmc_call(vboxDev,
                                VBOXGUEST_IOCTL_HGCM_CALL_TIMED(u32Size), pInfo);
-        rc = -RTErrConvertToErrno(vrc);
+        rc = -vboxadd_convert_result(vrc);
+        if (rc < 0)
+            LogFunc(("HGCM call failed, error %Rrc", vrc));
         if (   rc >= 0
             && copy_to_user ((void *)userspace_info, (void *)pInfo, u32Size))