Changeset 4925 in vbox

Timestamp:

Sep 20, 2007 12:07:28 PM (18 years ago)

Author:

vboxsync

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

24671

Message:

Added a LogRel with additional driver open info. Return the VERR_VM_DRIVER_* stuff on Solaris, Darwin, FreeBSD and OS/2 as well.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• darwin/SUPLib-darwin.cpp (modified) (1 diff)
• freebsd/SUPLib-freebsd.cpp (modified) (1 diff)
• linux/SUPLib-linux.cpp (modified) (1 diff)
• os2/SUPLib-os2.cpp (modified) (1 diff)
• solaris/SUPLib-solaris.cpp (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/darwin/SUPLib-darwin.cpp

@@ -125 +125 @@
     if (g_hDevice < 0)
     {
-        int rc = errno;
-        LogRel(("Failed to open \"%s\", errno=%d\n", rc));
+        int rc;
+        switch (errno)
+        {
+            case ENODEV:    rc = VERR_VM_DRIVER_LOAD_ERROR; break;
+            case EPERM:
+            case EACCES:    rc = VERR_VM_DRIVER_NOT_ACCESSIBLE; break;
+            case ENOENT:    rc = VERR_VM_DRIVER_NOT_INSTALLED; break;
+            default:        rc = VERR_VM_DRIVER_OPEN_ERROR; break;
+        }
+        LogRel(("Failed to open \"%s\", errno=%d, rc=%Vrc\n", DEVICE_NAME, errno, rc));
+
         kr = IOServiceClose(g_Connection);
         if (kr != kIOReturnSuccess)
             LogRel(("Warning: IOServiceClose(%p) returned %d\n", g_Connection, kr));
-        return RTErrConvertFromErrno(rc);
+        return rc;
     }
 

trunk/src/VBox/HostDrivers/Support/freebsd/SUPLib-freebsd.cpp

@@ -68 +68 @@
     if (g_hDevice < 0)
     {
-        int rc = errno;
-        LogRel(("Failed to open \"%s\", errno=%d\n", rc));
+        int rc;
+        switch (errno)
+        {
+            case ENODEV:    rc = VERR_VM_DRIVER_LOAD_ERROR; break;
+            case EPERM:
+            case EACCES:    rc = VERR_VM_DRIVER_NOT_ACCESSIBLE; break;
+            case ENOENT:    rc = VERR_VM_DRIVER_NOT_INSTALLED; break;
+            default:        rc = VERR_VM_DRIVER_OPEN_ERROR; break;
+        }
+        LogRel(("Failed to open \"%s\", errno=%d, rc=%Vrc\n", DEVICE_NAME, errno, rc));
         return RTErrConvertFromErrno(rc);
     }

trunk/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp

@@ -100 +100 @@
         if (g_hDevice < 0)
         {
+            int rc;
             switch (errno)
             {
                 case ENXIO: /* see man 2 open, ENODEV is actually a kernel bug */
-                case ENODEV:    return VERR_VM_DRIVER_LOAD_ERROR;
+                case ENODEV:    rc = VERR_VM_DRIVER_LOAD_ERROR; break;
                 case EPERM:
-                case EACCES:    return VERR_VM_DRIVER_NOT_ACCESSIBLE;
-                case ENOENT:    return VERR_VM_DRIVER_NOT_INSTALLED;
-                default:
-                    return VERR_VM_DRIVER_OPEN_ERROR;
+                case EACCES:    rc = VERR_VM_DRIVER_NOT_ACCESSIBLE; break;
+                case ENOENT:    rc = VERR_VM_DRIVER_NOT_INSTALLED; break;
+                default:        rc = VERR_VM_DRIVER_OPEN_ERROR; break;
             }
+            LogRel(("Failed to open \"%s\", errno=%d, rc=%Vrc\n", DEVICE_NAME, errno, rc));
+            return rc;
         }
     }

trunk/src/VBox/HostDrivers/Support/os2/SUPLib-os2.cpp

@@ -92 +92 @@
                         NULL);
     if (rc)
-        return RTErrConvertFromOS2(rc);
+    {
+        int vrc;
+        switch (rc)
+        {
+            case ERROR_FILE_NOT_FOUND:
+            case ERROR_PATH_NOT_FOUND:  vrc = VERR_VM_DRIVER_NOT_INSTALLED; break;
+            default:                    vrc = VERR_VM_DRIVER_OPEN_ERROR; break;
+        }
+        LogRel(("Failed to open \"%s\", rc=%d, vrc=%Vrc\n", DEVICE_NAME, rc, vrc));
+        return vrc;
+    }
     g_hDevice = hDevice;
 

trunk/src/VBox/HostDrivers/Support/solaris/SUPLib-solaris.cpp

@@ -73 +73 @@
     if (g_hDevice < 0)
     {
-        int rc = errno;
-        LogRel(("Failed to open \"%s\", errno=%d\n", rc));
-        return RTErrConvertFromErrno(rc);
+        int rc;
+        switch (errno)
+        {
+            case ENODEV:    rc = VERR_VM_DRIVER_LOAD_ERROR; break;
+            case EPERM:
+            case EACCES:    rc = VERR_VM_DRIVER_NOT_ACCESSIBLE; break;
+            case ENOENT:    rc = VERR_VM_DRIVER_NOT_INSTALLED; break;
+            default:        rc = VERR_VM_DRIVER_OPEN_ERROR; break;
+        }
+        LogRel(("Failed to open \"%s\", errno=%d, rc=%Vrc\n", DEVICE_NAME, errno, rc));
+        return rc;
     }