Changeset 40727 in vbox for trunk/src/VBox

Timestamp:

Mar 30, 2012 1:53:46 PM (13 years ago)

Author:

vboxsync

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

77195

Message:

IOMMMIOMapMMIO2Page: Must check IOM_LOCK status code.

File:

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

trunk/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp

@@ -2332 +2332 @@
  * (This is a special optimization used by the VGA device.)
  *
- * @returns VBox status code.
+ * @returns VBox status code.  This API may return VINF_SUCCESS even if no
+ *          remapping is made,.
  *
  * @param   pVM             The virtual machine.
@@ -2353 +2354 @@
         return VINF_SUCCESS;    /* ignore */
 
-    IOM_LOCK(pVM);
+    int rc = IOM_LOCK(pVM);
+    if (RT_FAILURE(rc))
+        return VINF_SUCCESS; /* better luck the next time around */
 
     /*
@@ -2371 +2374 @@
     GCPhysRemapped &= ~(RTGCPHYS)PAGE_OFFSET_MASK;
 
-    int rc = PGMHandlerPhysicalPageAlias(pVM, pRange->GCPhys, GCPhys, GCPhysRemapped);
+    rc = PGMHandlerPhysicalPageAlias(pVM, pRange->GCPhys, GCPhys, GCPhysRemapped);
 
     IOM_UNLOCK(pVM);