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

Timestamp:

Nov 19, 2018 5:18:36 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

126752

Message:

VBoxGuest-linux.c,VBoxGuest-solaris.c: Setup the IRQ after calling VGDrvCommonInitDevExt so that it's ready for it, like everyone else does it. Linux was also tearing down IRQs after common code terminated, this was also reverted (solaris got this right already).

Location:

trunk/src/VBox/Additions/common/VBoxGuest

Files:

• VBoxGuest-linux.c (modified) (3 diffs)
• VBoxGuest-solaris.c (modified) (3 diffs)

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

@@ -614 +614 @@
     {
         /*
-         * Register the interrupt service routine for it.
+         * Call the common device extension initializer.
          */
-        rc = vgdrvLinuxInitISR();
-        if (rc >= 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) && defined(RT_ARCH_X86)
+        VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux26;
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) && defined(RT_ARCH_AMD64)
+        VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux26_x64;
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0) && defined(RT_ARCH_X86)
+        VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux24;
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0) && defined(RT_ARCH_AMD64)
+        VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux24_x64;
+#else
+# warning "huh? which arch + version is this?"
+        VBOXOSTYPE enmOsType = VBOXOSTYPE_Linux;
+#endif
+        rc = VGDrvCommonInitDevExt(&g_DevExt,
+                                   g_IOPortBase,
+                                   g_pvMMIOBase,
+                                   g_cbMMIO,
+                                   enmOSType,
+                                   VMMDEV_EVENT_MOUSE_POSITION_CHANGED);
+        if (RT_SUCCESS(rc))
         {
             /*
-             * Call the common device extension initializer.
+             * Register the interrupt service routine for it now that g_DevExt can handle IRQs.
              */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) && defined(RT_ARCH_X86)
-            VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux26;
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) && defined(RT_ARCH_AMD64)
-            VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux26_x64;
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0) && defined(RT_ARCH_X86)
-            VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux24;
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0) && defined(RT_ARCH_AMD64)
-            VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux24_x64;
-#else
-# warning "huh? which arch + version is this?"
-            VBOXOSTYPE enmOsType = VBOXOSTYPE_Linux;
-#endif
-            rc = VGDrvCommonInitDevExt(&g_DevExt,
-                                       g_IOPortBase,
-                                       g_pvMMIOBase,
-                                       g_cbMMIO,
-                                       enmOSType,
-                                       VMMDEV_EVENT_MOUSE_POSITION_CHANGED);
-            if (RT_SUCCESS(rc))
+            rc = vgdrvLinuxInitISR();
+            if (rc >= 0) /** @todo r=bird: status check differs from that inside vgdrvLinuxInitISR. */
             {
 #ifdef VBOXGUEST_WITH_INPUT_DRIVER
@@ -687 +687 @@
                 }
 #endif
-                VGDrvCommonDeleteDevExt(&g_DevExt);
+                vgdrvLinuxTermISR();
             }
-            else
-            {
-                LogRel((DEVICE_NAME ": VGDrvCommonInitDevExt failed with rc=%Rrc\n", rc));
-                rc = RTErrConvertFromErrno(rc);
-            }
-            vgdrvLinuxTermISR();
+            VGDrvCommonDeleteDevExt(&g_DevExt);
+        }
+        else
+        {
+            LogRel((DEVICE_NAME ": VGDrvCommonInitDevExt failed with rc=%Rrc\n", rc));
+            rc = RTErrConvertFromErrno(rc);
         }
     }
@@ -723 +723 @@
     VGDrvCommonCloseSession(&g_DevExt, g_pKernelSession);
 #endif
+    vgdrvLinuxTermISR();
     VGDrvCommonDeleteDevExt(&g_DevExt);
-    vgdrvLinuxTermISR();
     pci_unregister_driver(&g_PciDriver);
     RTLogDestroy(RTLogRelSetDefaultInstance(NULL));

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

@@ -325 +325 @@
                         {
                             /*
-                             * Add IRQ of VMMDev.
+                             * Call the common device extension initializer.
                              */
-                            rc = vgdrvSolarisAddIRQ(pDip);
-                            if (rc == DDI_SUCCESS)
+                            rc = VGDrvCommonInitDevExt(&g_DevExt, g_uIOPortBase, g_pMMIOBase, g_cbMMIO,
+#if ARCH_BITS == 64
+                                                       VBOXOSTYPE_Solaris_x64,
+#else
+                                                       VBOXOSTYPE_Solaris,
+#endif
+                                                       VMMDEV_EVENT_MOUSE_POSITION_CHANGED);
+                            if (RT_SUCCESS(rc))
                             {
                                 /*
-                                 * Call the common device extension initializer.
+                                 * Add IRQ of VMMDev.
                                  */
-                                rc = VGDrvCommonInitDevExt(&g_DevExt, g_uIOPortBase, g_pMMIOBase, g_cbMMIO,
-#if ARCH_BITS == 64
-                                                           VBOXOSTYPE_Solaris_x64,
-#else
-                                                           VBOXOSTYPE_Solaris,
-#endif
-                                                           VMMDEV_EVENT_MOUSE_POSITION_CHANGED);
-                                if (RT_SUCCESS(rc))
+                                rc = vgdrvSolarisAddIRQ(pDip);
+                                if (rc == DDI_SUCCESS)
                                 {
                                     /*
@@ -346 +346 @@
                                      */
                                     VGDrvCommonProcessOptionsFromHost(&g_DevExt);
-
 
                                     rc = ddi_create_minor_node(pDip, DEVICE_NAME, S_IFCHR, instance, DDI_PSEUDO, 0 /* fFlags */);
@@ -357 +356 @@
 
                                     LogRel((DEVICE_NAME "::Attach: ddi_create_minor_node failed.\n"));
-                                    VGDrvCommonDeleteDevExt(&g_DevExt);
+                                    vgdrvSolarisRemoveIRQ(pDip);
                                 }
                                 else
-                                    LogRel((DEVICE_NAME "::Attach: VGDrvCommonInitDevExt failed.\n"));
-
-                                vgdrvSolarisRemoveIRQ(pDip);
+                                    LogRel((DEVICE_NAME "::Attach: vgdrvSolarisAddIRQ failed.\n"));
+                                VGDrvCommonDeleteDevExt(&g_DevExt);
                             }
                             else
-                                LogRel((DEVICE_NAME "::Attach: vgdrvSolarisAddIRQ failed.\n"));
+                                LogRel((DEVICE_NAME "::Attach: VGDrvCommonInitDevExt failed.\n"));
                             ddi_regs_map_free(&g_PciMMIOHandle);
                         }