Changeset 36031 in vbox

Timestamp:

Feb 21, 2011 12:25:12 PM (14 years ago)

Author:

vboxsync

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

70139

Message:

HostDrivers/solaris/USB: Initialize/term USB filter manager, should fix kernel panic in #5553.

File:

• trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSBMon-solaris.c (modified) (2 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSBMon-solaris.c

@@ -222 +222 @@
          */
         mutex_init(&g_VBoxUSBMonSolarisMtx, NULL, MUTEX_DRIVER, NULL);
-        rc = ddi_soft_state_init(&g_pVBoxUSBMonSolarisState, sizeof(vboxusbmon_state_t), 1);
-        if (!rc)
-        {
-            rc = mod_install(&g_VBoxUSBMonSolarisModLinkage);
+        rc = VBoxUSBFilterInit();
+        if (RT_SUCCESS(rc))
+        {
+            rc = ddi_soft_state_init(&g_pVBoxUSBMonSolarisState, sizeof(vboxusbmon_state_t), 1);
             if (!rc)
-                return rc;
-
-            LogRel((DEVICE_NAME ":mod_install failed! rc=%d\n", rc));
-            ddi_soft_state_fini(&g_pVBoxUSBMonSolarisState);
+            {
+                rc = mod_install(&g_VBoxUSBMonSolarisModLinkage);
+                if (!rc)
+                    return rc;
+
+                LogRel((DEVICE_NAME ":mod_install failed! rc=%d\n", rc));
+                ddi_soft_state_fini(&g_pVBoxUSBMonSolarisState);
+            }
+            else
+                LogRel((DEVICE_NAME ":ddi_soft_state_init failed! rc=%d\n", rc));
         }
         else
-            LogRel((DEVICE_NAME ":ddi_soft_state_init failed! rc=%d\n", rc));
+            LogRel((DEVICE_NAME ":VBoxUSBFilterInit failed! rc=%d\n", rc));
 
         mutex_destroy(&g_VBoxUSBMonSolarisMtx);
@@ -255 +261 @@
     {
         ddi_soft_state_fini(&g_pVBoxUSBMonSolarisState);
+        VBoxUSBFilterTerm();
         mutex_destroy(&g_VBoxUSBMonSolarisMtx);