Changeset 81937 in vbox

Timestamp:

Nov 18, 2019 12:11:28 PM (5 years ago)

Author:

vboxsync

Message:

PDMDevice.cpp: Set VM error on device constructor failures when the constructor didn't do it already. bugref:9218

File:

• trunk/src/VBox/VMM/VMMR3/PDMDevice.cpp (modified) (2 diffs)

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

@@ -471 +471 @@
         {
             LogRel(("PDM: Failed to construct '%s'/%d! %Rra\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
-            paDevs[i].pDev->cInstances--;
+            if (VMR3GetErrorCount(pVM->pUVM) == 0)
+                VMSetError(pVM, rc, RT_SRC_POS, "Failed to construct device '%s' instance #%u",
+                           pDevIns->pReg->szName, pDevIns->iInstance);
             /* Because we're damn lazy, the destructor will be called even if
                the constructor fails.  So, no unlinking. */
+            paDevs[i].pDev->cInstances--;
             return rc == VERR_VERSION_MISMATCH ? VERR_PDM_DEVICE_VERSION_MISMATCH : rc;
         }
@@ -494 +497 @@
             {
                 LogRel(("PDM: Failed to construct (ring-0) '%s'/%d! %Rra\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
+                if (VMR3GetErrorCount(pVM->pUVM) == 0)
+                    VMSetError(pVM, rc, RT_SRC_POS, "The ring-0 constructor of device '%s' instance #%u failed",
+                               pDevIns->pReg->szName, pDevIns->iInstance);
                 paDevs[i].pDev->cInstances--;
                 return rc == VERR_VERSION_MISMATCH ? VERR_PDM_DEVICE_VERSION_MISMATCH : rc;