Changeset 57377 in vbox for trunk/src/VBox

Timestamp:

Aug 17, 2015 11:43:10 AM (9 years ago)

Author:

vboxsync

Message:

PDMLdr.cpp: Use VMR3SetError for load failures so we can report early init errors (i.e. loading VMMR0.r0).

File:

• trunk/src/VBox/VMM/VMMR3/PDMLdr.cpp (modified) (1 diff)

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

@@ -722 +722 @@
 
     /* Don't consider VERR_PDM_MODULE_NAME_CLASH and VERR_NO_MEMORY above as these are very unlikely. */
-    if (RT_FAILURE(rc) && pUVM->pVM) /** @todo VMR3SetErrorU. */
-        rc = VMSetError(pUVM->pVM, rc, RT_SRC_POS, N_("Cannot load R0 module %s: %s"), pszFilename, ErrInfo.Core.pszMsg);
+    if (RT_FAILURE(rc))
+        rc = VMR3SetError(pUVM, rc, RT_SRC_POS, N_("Failed to load R0 module %s: %s"), pszFilename, ErrInfo.Core.pszMsg);
 
     RTMemTmpFree(pszFile); /* might be reference thru pszFilename in the above VMSetError call. */