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

Timestamp:

Jun 19, 2009 1:50:56 PM (16 years ago)

Author:

vboxsync

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

48840

Message:

IOM locking change

File:

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

trunk/src/VBox/VMM/IOM.cpp

@@ -1471 +1471 @@
          * Try register it with PGM and then insert it into the tree.
          */
+        iomLock(pVM);
+        iomR3FlushCache(pVM);
         rc = PGMR3PhysMMIORegister(pVM, GCPhysStart, cbRange,
                                    IOMR3MMIOHandler, pRange,
@@ -1477 +1479 @@
         if (RT_SUCCESS(rc))
         {
-            iomLock(pVM);
             if (RTAvlroGCPhysInsert(&pVM->iom.s.pTreesR3->MMIOTree, &pRange->Core))
             {
@@ -1483 +1484 @@
                 return VINF_SUCCESS;
             }
+
+            /* bail out */
             iomUnlock(pVM);
-
-            /* bail out */
             DBGFR3Info(pVM, "mmio", NULL, NULL);
             AssertMsgFailed(("This cannot happen!\n"));
             rc = VERR_INTERNAL_ERROR;
         }
+        else
+            iomUnlock(pVM);
+
         MMHyperFree(pVM, pRange);
     }