Changeset 6775 in vbox for trunk/src/VBox/Additions

Timestamp:

Feb 4, 2008 7:53:23 AM (17 years ago)

Author:

vboxsync

Message:

Solaris vboxguest: Fix and cleanups.

File:

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

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

@@ -157 +157 @@
     /** VMMDev Version. */
     uint32_t                u32Version;
-    /** Interrupt handle vector */
+    /** Pointer to the interrupt handle vector */
     ddi_intr_handle_t       *pIntr;
-    /** Number of interrupt handles */
-    size_t                  cIntr;
+    /** Number of actually allocated interrupt handles */
+    size_t                  cIntrAllocated;
 #ifndef USE_SESSION_HASH
     /** Pointer to the session handle. */
@@ -870 +870 @@
                 if (rc == DDI_SUCCESS)
                 {
-                    /* Allocated kernel memory for the interrupt handles. */
-                    pState->cIntr = IntrCount;
-                    pState->pIntr = RTMemAlloc(pState->cIntr * sizeof(ddi_intr_handle_t));
+                    /* Allocated kernel memory for the interrupt handles. The allocation size is stored internally. */
+                    pState->pIntr = RTMemAlloc(IntrCount * sizeof(ddi_intr_handle_t));
                     if (pState->pIntr)
                     {
@@ -880 +879 @@
                             && IntrAllocated > 0)
                         {
-                            pState->cIntr = IntrAllocated;
+                            pState->cIntrAllocated = IntrAllocated;
                             uint_t uIntrPriority;
                             rc = ddi_intr_get_pri(pState->pIntr[0], &uIntrPriority);
@@ -914 +913 @@
 
                             /* Remove allocated IRQs, too bad we can free only one handle at a time. */
-                            for (int k = 0; k < pState->cIntr; k++)
+                            for (int k = 0; k < pState->cIntrAllocated; k++)
                                 ddi_intr_free(pState->pIntr[k]);
                         }
@@ -955 +954 @@
     mutex_destroy(&pState->Mtx);
 #else
-    for (int i = 0; i < pState->cIntr; i++)
+    for (int i = 0; i < pState->cIntrAllocated; i++)
     {
         int rc = ddi_intr_disable(pState->pIntr[i]);
@@ -985 +984 @@
     mutex_exit(&pState->Mtx);
 
-    return fOurIRQ ? DDI_INTR_CLAIMED : DDI_INTR_CLAIMED;
+    return fOurIRQ ? DDI_INTR_CLAIMED : DDI_INTR_UNCLAIMED;
 }