Changeset 35902 in vbox

Timestamp:

Feb 8, 2011 4:13:18 PM (14 years ago)

Author:

vboxsync

Message:

VMMR0.cpp: Added the IntNetR0Term call to ModuleInit that was missing in r67595. Cleanups.

File:

• trunk/src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -31 +31 @@
 #include <VBox/vmm/vm.h>
 #ifdef VBOX_WITH_PCI_PASSTHROUGH
-#include <VBox/vmm/pdmpci.h>
+# include <VBox/vmm/pdmpci.h>
 #endif
 
@@ -42 +42 @@
 #include <VBox/version.h>
 #include <VBox/log.h>
-
 
 #include <iprt/asm-amd64-x86.h>
@@ -142 +141 @@
                                     return VINF_SUCCESS;
                                 }
+
+                                /*
+                                 * Bail out.
+                                 */
+#ifdef VBOX_WITH_PCI_PASSTHROUGH
+                                PciRawR0Term();
+#endif
                             }
-
-                            /* bail out */
-                            LogFlow(("ModuleTerm: returns %Rrc\n", rc));
-#ifdef VBOX_WITH_PCI_PASSTHROUGH
-                            PciRawR0Term();
-#endif
+                            IntNetR0Term();
+                        }
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
-                            PGMR0DynMapTerm();
-#endif
-                        }
+                        PGMR0DynMapTerm();
+#endif
                     }
                     PGMDeregisterStringFormatTypes();
@@ -187 +188 @@
 
     /*
-     * PGM (Darwin) and HWACCM global cleanup.
+     * PGM (Darwin), HWACCM and PciRaw global cleanup.
      */
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
     PGMR0DynMapTerm();
 #endif
-
 #ifdef VBOX_WITH_PCI_PASSTHROUGH
-    /*
-     * Terminate PCI passthrough service.
-     */
     PciRawR0Term();
 #endif
@@ -1556 +1553 @@
     RTAssertMsg2V(pszFormat, va);
 }
+