Changeset 19333 in vbox for trunk

Timestamp:

May 4, 2009 3:57:43 PM (16 years ago)

Author:

vboxsync

Message:

EMT macro updates.

Location:

trunk

Files:

• include/VBox/vm.h (modified) (3 diffs)
• src/VBox/VMM/PGMPool.cpp (modified) (1 diff)

trunk/include/VBox/vm.h

@@ -37 +37 @@
 #include <VBox/vmapi.h>
 #include <VBox/sup.h>
+#include <VBox/vmm.h>
 
 
@@ -428 +429 @@
 #ifdef IN_RC
 # define VM_IS_EMT(pVM)                     true
-#elif defined(IN_RING0)
-# define VM_IS_EMT(pVM)                     true
 #else
-/** @todo need to rework this macro for the case of multiple emulation threads for SMP */
-# define VM_IS_EMT(pVM)                     (VMR3GetVMCPUNativeThread(pVM) == RTThreadNativeSelf())
+# define VM_IS_EMT(pVM)                     (VMMGetCpu(pVM) != NULL)
 #endif
 
@@ -441 +439 @@
 #ifdef IN_RC
 # define VMCPU_IS_EMT(pVCpu)                true
-#elif defined(IN_RING0)
-# define VMCPU_IS_EMT(pVCpu)                fixme - need to call HWACCM I think... /** @todo SMP */
 #else
-/** @todo need to rework this macro for the case of multiple emulation threads for SMP */
-# define VMCPU_IS_EMT(pVCpu)                ((pVCpu)->hNativeThread == RTThreadNativeSelf())
+# define VMCPU_IS_EMT(pVCpu)                (pVCpu && (pVCpu == VMMGetCpu(pVCpu->CTX_SUFF(pVM))))
 #endif
 

trunk/src/VBox/VMM/PGMPool.cpp

@@ -526 +526 @@
      * We cannot flush a page if we're in an async thread because of REM notifications.
      */
-    if (!VM_IS_EMT(pVM))
+    if (!pVCpu)
     {
         Log(("pgmR3PoolAccessHandler: async thread, requesting EMT to flush the page: %p:{.Core=%RHp, .idx=%d, .GCPhys=%RGp, .enmType=%d}\n",