Changeset 8250 in vbox for trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c

Timestamp:

Apr 21, 2008 6:42:58 PM (17 years ago)

Author:

vboxsync

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

29989

Message:

Additions/FreeBSD: Setup IRQ only if initializing of the device state was successful, eliminate a tab

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c (modified) (2 diffs)

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

@@ -556 +556 @@
         {
             /*
-             * Add IRQ of VMMDev.
+             * Call the common device extension initializer.
              */
-            rc = VBoxGuestFreeBSDAddIRQ(pDevice, pState);
+            rc = VBoxGuestInitDevExt(&g_DevExt, pState->uIOPortBase, pState->pMMIOBase,
+                                     pState->VMMDevMemSize, VBOXOSTYPE_FreeBSD);
             if (RT_SUCCESS(rc))
             {
                 /*
-                 * Call the common device extension initializer.
+                 * Add IRQ of VMMDev.
                  */
-                rc = VBoxGuestInitDevExt(&g_DevExt, pState->uIOPortBase, pState->pMMIOBase,
-                                            pState->VMMDevMemSize, VBOXOSTYPE_FreeBSD);
+                rc = VBoxGuestFreeBSDAddIRQ(pDevice, pState);
                 if (RT_SUCCESS(rc))
                 {
@@ -579 +579 @@
                     }
 
-                    printf("vboxdrv: EVENTHANDLER_REGISTER(dev_clone,,,) failed\n");
+                    printf(DEVICE_NAME ": EVENTHANDLER_REGISTER(dev_clone,,,) failed\n");
                     clone_cleanup(&g_pVBoxGuestFreeBSDClones);
-                    VBoxGuestDeleteDevExt(&g_DevExt);
+                    VBoxGuestFreeBSDRemoveIRQ(pDevice, pState);
                 }
                 else
                     printf((DEVICE_NAME ":VBoxGuestInitDevExt failed.\n"));
-                VBoxGuestFreeBSDRemoveIRQ(pDevice, pState);
+                VBoxGuestDeleteDevExt(&g_DevExt);
             }
             else