Changeset 19807 in vbox

Timestamp:

May 19, 2009 9:01:05 AM (16 years ago)

Author:

vboxsync

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

47453

Message:

Some more locking updates

Location:

trunk

Files:

• include/VBox/iom.h (modified) (1 diff)
• src/VBox/VMM/PGMPhys.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/IOMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/PGMAllHandler.cpp (modified) (1 diff)

trunk/include/VBox/iom.h

@@ -216 +216 @@
 VMMDECL(int)  IOMMMIOMapMMIO2Page(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS GCPhysRemapped, uint64_t fPageFlags);
 VMMDECL(int)  IOMMMIOResetRegion(PVM pVM, RTGCPHYS GCPhys);
+VMMDECL(bool) IOMIsLockOwner(PVM pVM);
 
 #ifdef IN_RC

trunk/src/VBox/VMM/PGMPhys.cpp

@@ -1101 +1101 @@
 int pgmR3PhysRamReset(PVM pVM)
 {
+    Assert(PGMIsLockOwner(pVM));
     /*
      * We batch up pages before freeing them.

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

@@ -81 +81 @@
 }
 
+
+/**
+ * Check if this VCPU currently owns the IOM lock.
+ *
+ * @returns bool owner/not owner
+ * @param   pVM         The VM to operate on.
+ */
+VMMDECL(bool) IOMIsLockOwner(PVM pVM)
+{
+    return PDMCritSectIsOwner(&pVM->iom.s.EmtLock);
+}
+
 /**
  * Returns the contents of register or immediate data of instruction's parameter.

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

@@ -977 +977 @@
 VMMDECL(int)  PGMHandlerPhysicalPageAlias(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS GCPhysPage, RTGCPHYS GCPhysPageRemap)
 {
+///    Assert(!IOMIsLockOwner(pVM)); /* We mustn't own any other locks when calling this */
+
     /*
      * Lookup and validate the range.