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

Timestamp:

Feb 5, 2008 7:41:33 AM (17 years ago)

Author:

vboxsync

Message:

Solaris vboxguest: added proper checks while setting up IRQs.

File:

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

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

@@ -855 +855 @@
     return rc;
 #else
-    int IntrType;
+    int IntrType = 0;
     int rc = ddi_intr_get_supported_types(pDip, &IntrType);
     if (rc == DDI_SUCCESS)
@@ -862 +862 @@
         if (IntrType & DDI_INTR_TYPE_FIXED)
         {
-            int IntrCount;
+            int IntrCount = 0;
             rc = ddi_intr_get_nintrs(pDip, IntrType, &IntrCount);
-            if (rc == DDI_SUCCESS)
+            if (   rc == DDI_SUCCESS
+                && IntrCount > 0)
             {
-                int IntrAvail;
+                int IntrAvail = 0;
                 rc = ddi_intr_get_navail(pDip, IntrType, &IntrAvail);
-                if (rc == DDI_SUCCESS)
+                if (   rc == DDI_SUCCESS
+                    && IntrAvail > 0)
                 {
                     /* Allocated kernel memory for the interrupt handles. The allocation size is stored internally. */
@@ -924 +926 @@
                 }
                 else
-                    LogRel((DEVICE_NAME ":VBoxGuestSolarisAddIRQ: failed to get available IRQs. rc=%d\n", rc));
+                    LogRel((DEVICE_NAME ":VBoxGuestSolarisAddIRQ: failed to get or insufficient available IRQs. rc=%d IntrAvail=%d\n", rc, IntrAvail));
             }
             else
-                LogRel((DEVICE_NAME ":VBoxGuestSolarisAddIRQ: failed to get number of IRQs. rc=%d\n", rc));
+                LogRel((DEVICE_NAME ":VBoxGuestSolarisAddIRQ: failed to get or insufficient number of IRQs. rc=%d IntrCount=%d\n", rc, IntrCount));
         }
         else
-            LogRel((DEVICE_NAME ":VBoxGuestSolarisAddIRQ: invalid irq type. IntrType=%d\n", IntrType));
+            LogRel((DEVICE_NAME ":VBoxGuestSolarisAddIRQ: invalid irq type. IntrType=%#x\n", IntrType));
     }
     else