Changeset 90876 in vbox for trunk/src

Timestamp:

Aug 25, 2021 11:30:45 AM (3 years ago)

Author:

vboxsync

Message:

Solaris guest: bugref:10089 vboxms: Fixed getinfo() callback.

File:

• trunk/src/VBox/Additions/solaris/Mouse/vboxms.c (modified) (2 diffs)

trunk/src/VBox/Additions/solaris/Mouse/vboxms.c

@@ -329 +329 @@
         {
             int rc;
-            int instance = ddi_get_instance(pDip);
             /* Only one instance supported. */
             if (!ASMAtomicCmpXchgPtr(&g_OpenNodeState.pDip, pDip, NULL))
                 return DDI_FAILURE;
-            rc = ddi_create_minor_node(pDip, DEVICE_NAME, S_IFCHR, instance, DDI_PSEUDO, 0);
+            rc = ddi_create_minor_node(pDip, DEVICE_NAME, S_IFCHR, 0 /* instance */, DDI_PSEUDO, 0 /* flags */);
             if (rc == DDI_SUCCESS)
                 return DDI_SUCCESS;
@@ -403 +402 @@
     {
         case DDI_INFO_DEVT2DEVINFO:
+        {
             *ppvResult = (void *)g_OpenNodeState.pDip;
+            if (!*ppvResult)
+                rc = DDI_FAILURE;
             break;
+        }
 
         case DDI_INFO_DEVT2INSTANCE:
-            *ppvResult = (void *)(uintptr_t)ddi_get_instance(g_OpenNodeState.pDip);
+        {
+            /* There can only be a single-instance of this driver and thus its instance number is 0. */
+            *ppvResult = (void *)0;
             break;
+        }
 
         default: