Changeset 18860 in vbox for trunk/src/VBox/VMM

Timestamp:

Apr 10, 2009 9:06:05 AM (16 years ago)

Author:

vboxsync

Message:

IOM: Make the MMIO description string unique.

File:

• trunk/src/VBox/VMM/IOM.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/IOM.cpp

@@ -1388 +1388 @@
 
     /*
+     * For the 2nd+ instance, mangle the description string so it's unique.
+     * (PGM requires this.)
+     */
+    if (pDevIns->iInstance > 0)
+    {
+        pszDesc = MMR3HeapAPrintf(pVM, MM_TAG_IOM, "%s [%u]", pszDesc, pDevIns->iInstance);
+        if (!pszDesc)
+            return VERR_NO_MEMORY;
+    }
+
+
+    /*
      * Allocate new range record and initialize it.
      */
@@ -1430 +1442 @@
                 return VINF_SUCCESS;
 
+            /* bail out */
             DBGFR3Info(pVM, "mmio", NULL, NULL);
             AssertMsgFailed(("This cannot happen!\n"));
@@ -1436 +1449 @@
         MMHyperFree(pVM, pRange);
     }
-
+    if (pDevIns->iInstance > 0)
+        MMR3HeapFree((void *)pszDesc);
     return rc;
 }
@@ -1614 +1628 @@
         /* advance and free. */
         GCPhys = pRange->Core.KeyLast + 1;
+        if (pDevIns->iInstance > 0)
+            MMR3HeapFree((void *)pRange->pszDesc);
         MMHyperFree(pVM, pRange);
     }