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

Timestamp:

Jan 13, 2010 9:58:10 AM (15 years ago)

Author:

vboxsync

Message:

Solaris/Additions: prevent automatic module unloading, uninit vars.

File:

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

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

@@ -186 +186 @@
 {
     LogFlow((DEVICE_NAME ":_init\n"));
+
+    /*
+     * Prevent module autounloading.
+     */
+    modctl_t *pModCtl = mod_getctl(&g_VBoxGuestSolarisModLinkage);
+    if (pModCtl)
+        pModCtl->mod_loadflags |= MOD_NOAUTOUNLOAD;
+    else
+        LogRel((DEVICE_NAME ":failed to disable autounloading!\n"));
+
     int rc = ddi_soft_state_init(&g_pVBoxGuestSolarisState, sizeof(vboxguest_state_t), 1);
     if (!rc)
@@ -420 +430 @@
 {
     int                 rc;
-    PVBOXGUESTSESSION   pSession;
+    PVBOXGUESTSESSION   pSession = NULL;
 
     LogFlow((DEVICE_NAME "::Open\n"));
@@ -472 +482 @@
     LogFlow((DEVICE_NAME "::Close pid=%d\n", (int)RTProcSelf()));
 
-    PVBOXGUESTSESSION pSession;
+    PVBOXGUESTSESSION pSession = NULL;
     vboxguest_state_t *pState = ddi_get_soft_state(g_pVBoxGuestSolarisState, getminor(Dev));
     if (!pState)
@@ -503 +513 @@
     LogFlow((DEVICE_NAME "::Read\n"));
 
-    PVBOXGUESTSESSION pSession;
     vboxguest_state_t *pState = ddi_get_soft_state(g_pVBoxGuestSolarisState, getminor(Dev));
     if (!pState)
@@ -511 +520 @@
     }
 
+    PVBOXGUESTSESSION pSession = pState->pSession;
     uint32_t u32CurSeq = ASMAtomicUoReadU32(&g_DevExt.u32MousePosChangedSeq);
     if (pSession->u32MousePosChangedSeq != u32CurSeq)