Changeset 6150 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Dec 19, 2007 10:55:09 AM (17 years ago)

Author:

vboxsync

Message:

vboxadd return code and makedevice number fixes.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c (modified) (8 diffs)

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

@@ -524 +524 @@
     {
         pState->pSession = pSession;
+        *pDev = makedevice(getmajor(*pDev), iOpenInstance);
         Log((DEVICE_NAME "VBoxAddSolarisOpen: pSession=%p pState=%p\n", pSession, pState));
         return 0;
@@ -547 +548 @@
         RTSpinlockReleaseNoInts(g_Spinlock, &Tmp);
 
+        int instance;
+        for (instance = 0; instance < 4096; instance++)
+        {
+            VBoxAddDevState *pState = ddi_get_soft_state(g_pVBoxAddSolarisState, instance);
+            if (pState)
+                break;
+        }
+        if (instance >= 4096)
+        {
+            Log((DEVICE_NAME ":VBoxAddSolarisOpen: All instances exhausted\n"));
+            return ENXIO;
+        }
+        *pDev = makedevice(getmajor(*pDev), instance);
         Log((DEVICE_NAME "VBoxAddSolarisOpen: g_DevExt=%p pSession=%p rc=%d pid=%d\n", &g_DevExt, pSession, rc, (int)RTProcSelf()));
         return 0;
@@ -601 +615 @@
     {
         Log((DEVICE_NAME ":VBoxGuestIoctl: WHUT?!? pSession == NULL! This must be a mistake... pid=%d", (int)Process));
-        return VERR_INVALID_PARAMETER;
+        return EFAULT;
     }
 #else
@@ -609 +623 @@
     {
         Log((DEVICE_NAME ":VBoxAddSolarisClose: failed to get pState.\n"));
-        return DDI_FAILURE;
+        return EFAULT;
     }
 
@@ -618 +632 @@
     {
         Log((DEVICE_NAME ":VBoxAddSolarisClose: failed to get pSession.\n"));
-        return DDI_FAILURE;
+        return EFAULT;
     }
 #endif
@@ -633 +647 @@
 {
     LogFlow((DEVICE_NAME ":VBoxAddSolarisRead\n"));
-    return DDI_SUCCESS;
+    return 0;
 }
 
@@ -640 +654 @@
 {
     LogFlow((DEVICE_NAME ":VBoxAddSolarisWrite\n"));
-    return DDI_SUCCESS;
+    return 0;
 }
 
@@ -705 +719 @@
     {
         Log((DEVICE_NAME ":VBoxAddSolarisIOCtl: no session data for %d\n", getminor(Dev)));
-        return DDI_SUCCESS;
+        return EINVAL;
     }
 #endif