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

Timestamp:

Jan 21, 2008 2:45:45 PM (17 years ago)

Author:

vboxsync

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

27371

Message:

r=bird: This isn't the way I told you to handle big buffers, please fix. Enforced #ifndef USE_SESSION_HASH to make diffing with the host driver simpler.

File:

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

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

@@ -577 +577 @@
     LogFlow((DEVICE_NAME ":VBoxAddSolarisClose pid=%d\n", (int)RTProcSelf()));
 
-#ifdef USE_SESSION_HASH
+#ifndef USE_SESSION_HASH
+    PVBOXGUESTSESSION pSession;
+    VBoxAddDevState *pState = ddi_get_soft_state(g_pVBoxAddSolarisState, getminor(Dev));
+    if (!pState)
+    {
+        Log((DEVICE_NAME ":VBoxAddSolarisClose: failed to get pState.\n"));
+        return EFAULT;
+    }
+
+    pSession = pState->pSession;
+    pState->pSession = NULL;
+    Log((DEVICE_NAME ":VBoxAddSolarisClose: pSession=%p pState=%p\n", pSession, pState));
+    ddi_soft_state_free(g_pVBoxAddSolarisState, getminor(Dev));
+    if (!pSession)
+    {
+        Log((DEVICE_NAME ":VBoxAddSolarisClose: failed to get pSession.\n"));
+        return EFAULT;
+    }
+
+#else /* USE_SESSION_HASH */
     /*
      * Remove from the hash table.
@@ -621 +640 @@
     }
     Log((DEVICE_NAME ":VBoxAddSolarisClose: pid=%d\n", (int)Process));
-#else
-    PVBOXGUESTSESSION pSession;
-    VBoxAddDevState *pState = ddi_get_soft_state(g_pVBoxAddSolarisState, getminor(Dev));
-    if (!pState)
-    {
-        Log((DEVICE_NAME ":VBoxAddSolarisClose: failed to get pState.\n"));
-        return EFAULT;
-    }
-
-    pSession = pState->pSession;
-    pState->pSession = NULL;
-    Log((DEVICE_NAME ":VBoxAddSolarisClose: pSession=%p pState=%p\n", pSession, pState));
-    ddi_soft_state_free(g_pVBoxAddSolarisState, getminor(Dev));
-    if (!pSession)
-    {
-        Log((DEVICE_NAME ":VBoxAddSolarisClose: failed to get pSession.\n"));
-        return EFAULT;
-    }
-#endif
+#endif /* USE_SESSION_HASH */
 
     /*
@@ -679 +680 @@
     LogFlow((DEVICE_NAME ":VBoxAddSolarisIOCtl\n"));
 
-#ifdef USE_SESSION_HASH
+#ifndef USE_SESSION_HASH
+    /*
+     * Get the session from the soft state item.
+     */
+    VBoxAddDevState *pState = ddi_get_soft_state(g_pVBoxAddSolarisState, getminor(Dev));
+    if (!pState)
+    {
+        Log((DEVICE_NAME ":VBoxAddSolarisIOCtl: no state data for %d\n", getminor(Dev)));
+        return EINVAL;
+    }
+
+    PVBOXGUESTSESSION pSession = pState->pSession;
+    if (!pSession)
+    {
+        Log((DEVICE_NAME ":VBoxAddSolarisIOCtl: no session data for %d\n", getminor(Dev)));
+        return EINVAL;
+    }
+
+#else /* USE_SESSION_HASH */
     RTSPINLOCKTMP       Tmp = RTSPINLOCKTMP_INITIALIZER;
     const RTPROCESS     Process = RTProcSelf();
@@ -701 +720 @@
         return EINVAL;
     }
-#else
-    /*
-     * Get the session from the soft state item.
-     */
-    VBoxAddDevState *pState = ddi_get_soft_state(g_pVBoxAddSolarisState, getminor(Dev));
-    if (!pState)
-    {
-        Log((DEVICE_NAME ":VBoxAddSolarisIOCtl: no state data for %d\n", getminor(Dev)));
-        return EINVAL;
-    }
-
-    PVBOXGUESTSESSION pSession = pState->pSession;
-    if (!pSession)
-    {
-        Log((DEVICE_NAME ":VBoxAddSolarisIOCtl: no session data for %d\n", getminor(Dev)));
-        return EINVAL;
-    }
-#endif
-
+#endif /* USE_SESSION_HASH */
+
+    /** @todo r=bird: This is not the way I told you to implement this. Just do it exactly like the support
+     * driver, i.e. the request is just a fixed size header containing the buffer pointer and size of the
+     * real request (SUPREQHDR). Trying to save the extra ddi_copyin isn't worth the effort and inflexibility. */
     uint32_t cbBuf = 0;
     int rc = 0;
@@ -751 +756 @@
             LogRel((DEVICE_NAME ":ddi_copyin failed. rc=%d\n", rc));
         else
+/** @todo r=bird: this should be handled by generic code and not here so it works 100% the same everywhere. */
             Log(("%.*s", cbBuf, pszLogMsg));
         RTMemTmpFree(pszLogMsg);