Changeset 90570 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Aug 7, 2021 1:01:04 PM (3 years ago)

Author:

vboxsync

Message:

VMM/PDMCritSectRw: Added a self pointer for use with queued-leave to the read/write critical sections as well. bugref:6695

File:

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

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

@@ -650 +650 @@
                     LogFlow(("PDMCritSectRwLeaveShared: [%d]=%p => R3 c=%d (%#llx)\n", i, pThis, c, u64State));
                     AssertFatal(i < RT_ELEMENTS(pVCpu->pdm.s.apQueuedCritSectRwShrdLeaves));
-/** @todo This doesn't work any more for devices. */
-                    pVCpu->pdm.s.apQueuedCritSectRwShrdLeaves[i] = MMHyperCCToR3(pVM, pThis);
+                    pVCpu->pdm.s.apQueuedCritSectRwShrdLeaves[i] = pThis->s.pSelfR3;
                     VMCPU_FF_SET(pVCpu, VMCPU_FF_PDM_CRITSECT);
                     VMCPU_FF_SET(pVCpu, VMCPU_FF_TO_R3);
@@ -1255 +1254 @@
             LogFlow(("PDMCritSectRwLeaveShared: [%d]=%p => R3\n", i, pThis));
             AssertFatal(i < RT_ELEMENTS(pVCpu->pdm.s.apQueuedCritSectRwExclLeaves));
-/** @todo This doesn't work anymore for devices. */
-            pVCpu->pdm.s.apQueuedCritSectRwExclLeaves[i] = MMHyperCCToR3(pVM, pThis);
+            pVCpu->pdm.s.apQueuedCritSectRwExclLeaves[i] = pThis->s.pSelfR3;
             VMCPU_FF_SET(pVCpu, VMCPU_FF_PDM_CRITSECT);
             VMCPU_FF_SET(pVCpu, VMCPU_FF_TO_R3);