Changeset 38845 in vbox for trunk/src/VBox/VMM/VMMR3/VMM.cpp

Timestamp:

Sep 23, 2011 12:36:01 PM (13 years ago)

Author:

vboxsync

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

74142

Message:

VMM.cpp: bugfix.

File:

• trunk/src/VBox/VMM/VMMR3/VMM.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/VMMR3/VMM.cpp

@@ -1459 +1459 @@
 {
     int rc;
-    pVCpu->vmm.s.fInRendezvous = true;
 
     /*
@@ -1608 +1607 @@
     }
 
-    pVCpu->vmm.s.fInRendezvous = false;
     if (!fIsCaller)
         return vmmR3EmtRendezvousNonCallerReturn(pVM);
@@ -1628 +1626 @@
 VMMR3_INT_DECL(int) VMMR3EmtRendezvousFF(PVM pVM, PVMCPU pVCpu)
 {
-    return vmmR3EmtRendezvousCommon(pVM, pVCpu, false /* fIsCaller */, pVM->vmm.s.fRendezvousFlags,
-                                    pVM->vmm.s.pfnRendezvous, pVM->vmm.s.pvRendezvousUser);
+    Assert(!pVCpu->vmm.s.fInRendezvous);
+    pVCpu->vmm.s.fInRendezvous = true;
+    int rc = vmmR3EmtRendezvousCommon(pVM, pVCpu, false /* fIsCaller */, pVM->vmm.s.fRendezvousFlags,
+                                      pVM->vmm.s.pfnRendezvous, pVM->vmm.s.pvRendezvousUser);
+    pVCpu->vmm.s.fInRendezvous = false;
+    return rc;
 }
 
@@ -1708 +1710 @@
         }
         Assert(!VM_FF_ISPENDING(pVM, VM_FF_EMT_RENDEZVOUS));
+        Assert(!pVCpu->vmm.s.fInRendezvous);
+        pVCpu->vmm.s.fInRendezvous = true;
 
         /*
@@ -1755 +1759 @@
 
         ASMAtomicWriteU32(&pVM->vmm.s.u32RendezvousLock, 0);
+        pVCpu->vmm.s.fInRendezvous = false;
 
         /*