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

Timestamp:

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

Author:

vboxsync

Message:

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

File:

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

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

@@ -292 +292 @@
                 return DDI_FAILURE;
             }
-
-            int instance = ddi_get_instance(pDip);
 
             /*
@@ -347 +345 @@
                                     VGDrvCommonProcessOptionsFromHost(&g_DevExt);
 
-                                    rc = ddi_create_minor_node(pDip, DEVICE_NAME, S_IFCHR, instance, DDI_PSEUDO, 0 /* fFlags */);
+                                    rc = ddi_create_minor_node(pDip, DEVICE_NAME, S_IFCHR, 0 /* instance */, DDI_PSEUDO,
+                                                               0 /* fFlags */);
                                     if (rc == DDI_SUCCESS)
                                     {
@@ -468 +467 @@
     {
         case DDI_INFO_DEVT2DEVINFO:
+        {
             *ppvResult = (void *)g_pDip;
+            if (!*ppvResult)
+                rc = DDI_FAILURE;
             break;
+        }
 
         case DDI_INFO_DEVT2INSTANCE:
-            *ppvResult = (void *)(uintptr_t)ddi_get_instance(g_pDip);
+        {
+            /* There can only be a single-instance of this driver and thus its instance number is 0. */
+            *ppvResult = (void *)0;
             break;
+        }
 
         default: