Changeset 25006 in vbox

Timestamp:

Nov 26, 2009 2:46:03 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

55315

Message:

IOMR3IOPortDeregister: Fixed rc handling.

File:

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

trunk/src/VBox/VMM/IOM.cpp

@@ -929 +929 @@
             else
             {
-                 /*
-                  * Split the range, done.
-                  */
+                /*
+                 * Split the range, done.
+                 */
                 Assert(pRange->Core.KeyLast > PortLast && pRange->Core.Key < Port);
                 /* create tail. */
                 PIOMIOPORTRANGERC pRangeNew;
-                int rc = MMHyperAlloc(pVM, sizeof(*pRangeNew), 0, MM_TAG_IOM, (void **)&pRangeNew);
-                if (RT_FAILURE(rc))
+                int rc2 = MMHyperAlloc(pVM, sizeof(*pRangeNew), 0, MM_TAG_IOM, (void **)&pRangeNew);
+                if (RT_FAILURE(rc2))
                 {
                     iomUnlock(pVM);
-                    return rc;
+                    return rc2;
                 }
                 *pRangeNew = *pRange;
@@ -968 +968 @@
 
     /*
-     * Remove any R0 ranges first.
-     */
-    rc = VINF_SUCCESS;
+     * Remove any R0 ranges.
+     */
     Port = PortStart;
     while (Port <= PortLast && Port >= PortStart)
@@ -1013 +1012 @@
             else
             {
-                 /*
-                  * Split the range, done.
-                  */
+                /*
+                 * Split the range, done.
+                 */
                 Assert(pRange->Core.KeyLast > PortLast && pRange->Core.Key < Port);
                 /* create tail. */
                 PIOMIOPORTRANGER0 pRangeNew;
-                int rc = MMHyperAlloc(pVM, sizeof(*pRangeNew), 0, MM_TAG_IOM, (void **)&pRangeNew);
-                if (RT_FAILURE(rc))
+                int rc2 = MMHyperAlloc(pVM, sizeof(*pRangeNew), 0, MM_TAG_IOM, (void **)&pRangeNew);
+                if (RT_FAILURE(rc2))
                 {
                     iomUnlock(pVM);
-                    return rc;
+                    return rc2;
                 }
                 *pRangeNew = *pRange;
@@ -1101 +1100 @@
                 /* create tail. */
                 PIOMIOPORTRANGER3 pRangeNew;
-                int rc = MMHyperAlloc(pVM, sizeof(*pRangeNew), 0, MM_TAG_IOM, (void **)&pRangeNew);
-                if (RT_FAILURE(rc))
+                int rc2 = MMHyperAlloc(pVM, sizeof(*pRangeNew), 0, MM_TAG_IOM, (void **)&pRangeNew);
+                if (RT_FAILURE(rc2))
                 {
                     iomUnlock(pVM);
-                    return rc;
+                    return rc2;
                 }
                 *pRangeNew = *pRange;