Changeset 80542 in vbox

Timestamp:

Sep 2, 2019 7:56:13 AM (5 years ago)

Author:

vboxsync

Message:

VMM: Fix for problem loading VBoxEhciR0.r0 after PDM device refactoring. bugref:9218

Location:

trunk

Files:

• include/VBox/vmm/pdmapi.h (modified) (1 diff)
• src/VBox/VMM/VMMR3/PDMDevice.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/PDMLdr.cpp (modified) (2 diffs)

trunk/include/VBox/vmm/pdmapi.h

@@ -132 +132 @@
 VMMR3DECL(int)          PDMR3LdrEnumModules(PVM pVM, PFNPDMR3ENUM pfnCallback, void *pvArg);
 VMMR3_INT_DECL(void)    PDMR3LdrRelocateU(PUVM pUVM, RTGCINTPTR offDelta);
-VMMR3_INT_DECL(int)     PDMR3LdrLoadR0(PUVM pUVM, const char *pszModule);
+VMMR3_INT_DECL(int)     PDMR3LdrLoadR0(PUVM pUVM, const char *pszModule, const char *pszSearchPath);
 VMMR3_INT_DECL(int)     PDMR3LdrGetSymbolR3(PVM pVM, const char *pszModule, const char *pszSymbol, void **ppvValue);
 VMMR3DECL(int)          PDMR3LdrGetSymbolR0(PVM pVM, const char *pszModule, const char *pszSymbol, PRTR0PTR ppvValue);

trunk/src/VBox/VMM/VMMR3/PDMDevice.cpp

@@ -333 +333 @@
             AssertLogRel(fR0Enabled /* not possible to just enabled raw-mode atm. */);
 
-            rc = PDMR3LdrLoadR0(pVM->pUVM, pReg->pszR0Mod);
+            rc = PDMR3LdrLoadR0(pVM->pUVM, pReg->pszR0Mod, paDevs[i].pDev->pszR0SearchPath);
             if (RT_FAILURE(rc))
                 return VMR3SetError(pVM->pUVM, rc, RT_SRC_POS, "Failed to load ring-0 module '%s' for device '%s'",

trunk/src/VBox/VMM/VMMR3/PDMLdr.cpp

@@ -744 +744 @@
  * @param   pUVM            Pointer to the user mode VM structure.
  * @param   pszModule       Module name (no path).
- */
-VMMR3_INT_DECL(int) PDMR3LdrLoadR0(PUVM pUVM, const char *pszModule)
+ * @param   pszSearchPath   List of directories to search for the module
+ *                          (assumes @a pszModule is also a filename).
+ */
+VMMR3_INT_DECL(int) PDMR3LdrLoadR0(PUVM pUVM, const char *pszModule, const char *pszSearchPath)
 {
     /*
@@ -765 +767 @@
      * Okay, load it.
      */
-    return pdmR3LoadR0U(pUVM, NULL, pszModule, NULL);
+    return pdmR3LoadR0U(pUVM, NULL, pszModule, pszSearchPath);
 }