Changeset 24282 in vbox for trunk/src/VBox/VMM/PDMDevHlp.cpp

Timestamp:

Nov 3, 2009 10:14:35 AM (15 years ago)

Author:

vboxsync

Message:

PDM: Added missing driver instance checks.

File:

• trunk/src/VBox/VMM/PDMDevHlp.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/PDMDevHlp.cpp

@@ -847 +847 @@
      */
     int rc;
-    char szNode[48];
-    RTStrPrintf(szNode, sizeof(szNode), "LUN#%d", iLun);
-    PCFGMNODE   pNode = CFGMR3GetChild(pDevIns->Internal.s.pCfgHandle, szNode);
+    PCFGMNODE pNode = CFGMR3GetChildF(pDevIns->Internal.s.pCfgHandle, "LUN#%u", iLun);
     if (pNode)
     {
@@ -860 +858 @@
              */
             PPDMDRV pDrv = pdmR3DrvLookup(pVM, pszName);
-            if (pDrv)
+            if (    pDrv
+                &&  pDrv->cInstances < pDrv->pDrvReg->cMaxInstances)
             {
                 /* config node */
@@ -930 +929 @@
                 else
                     AssertMsgFailed(("Failed to create Config node! rc=%Rrc\n", rc));
+            }
+            else if (pDrv)
+            {
+                AssertMsgFailed(("Too many instances of driver '%s', max is %u\n", pszName, pDrv->pDrvReg->cMaxInstances));
+                rc = VERR_PDM_TOO_MANY_DRIVER_INSTANCES;
             }
             else