Changeset 30256 in vbox

Timestamp:

Jun 16, 2010 3:14:10 PM (15 years ago)

Author:

vboxsync

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

62758

Message:

Incorrect queue option resulted in deadlocks

File:

• trunk/src/VBox/VMM/PGMSharedPage.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/PGMSharedPage.cpp

@@ -161 +161 @@
  *
  * @param   pVM         The VM handle.
- */
-static DECLCALLBACK(void) pgmR3CheckSharedModulesHelper(PVM pVM)
-{
-    VMCPUID idCpu = VMMGetCpuId(pVM);
-
+ * @param   VMCPUID     VCPU id
+ */
+static DECLCALLBACK(void) pgmR3CheckSharedModulesHelper(PVM pVM, VMCPUID idCpu)
+{
     /* We must stall other VCPUs as we'd otherwise have to send IPI flush commands for every single change we make. */
     int rc = VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ONE_BY_ONE, pgmR3SharedModuleRegRendezvous, &idCpu);
@@ -182 +181 @@
 #ifdef VBOX_WITH_PAGE_SHARING
     /* Queue the actual registration as we are under the IOM lock right now. Perform this operation on the way out. */
-    return VMR3ReqCallNoWait(pVM, VMMGetCpuId(pVM), (PFNRT)pgmR3CheckSharedModulesHelper, 1, pVM);
+    return VMR3ReqCallNoWait(pVM, VMCPUID_ANY_QUEUE, (PFNRT)pgmR3CheckSharedModulesHelper, 2, pVM, VMMGetCpuId(pVM));
 #else
     return VERR_NOT_IMPLEMENTED;