Changeset 3177 in vbox for trunk

Timestamp:

Jun 20, 2007 10:48:41 AM (18 years ago)

Author:

vboxsync

Message:

First check vmmr0.r0 exports and then the builtin support driver exports. Otherwise ring 0 assertions in e.g. the devices module end up on the debug console.

File:

• trunk/src/VBox/HostDrivers/Support/SUPLib.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -1021 +1021 @@
         pszSymbol += sizeof("SUPR0$") - 1;
 
+    /*
+     * Check the VMMR0.r0 module if loaded.
+     */
+    /** @todo call the SUPLoadModule caller.... */
+    /** @todo proper reference counting and such. */
+    if (g_pvVMMR0 != NIL_RTR0PTR)
+    {
+        void *pvValue;
+        if (!SUPGetSymbolR0((void *)g_pvVMMR0, pszSymbol, &pvValue))
+        {
+            *pValue = (uintptr_t)pvValue;
+            return VINF_SUCCESS;
+        }
+    }
+
     /* iterate the function table. */
     int c = g_pFunctions->cFunctions;
@@ -1032 +1047 @@
         }
         pFunc++;
-    }
-
-    /*
-     * Check the VMMR0.r0 module if loaded.
-     */
-    /** @todo call the SUPLoadModule caller.... */
-    /** @todo proper reference counting and such. */
-    if (g_pvVMMR0 != NIL_RTR0PTR)
-    {
-        void *pvValue;
-        if (!SUPGetSymbolR0((void *)g_pvVMMR0, pszSymbol, &pvValue))
-        {
-            *pValue = (uintptr_t)pvValue;
-            return VINF_SUCCESS;
-        }
     }