Changeset 37362 in vbox

Timestamp:

Jun 7, 2011 6:41:01 PM (14 years ago)

Author:

vboxsync

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

72131

Message:

PGMNotifyNxeChanged: Another try.

Location:

trunk

Files:

• include/VBox/vmm/vm.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/PGMAll.cpp (modified) (1 diff)

trunk/include/VBox/vmm/vm.h

@@ -645 +645 @@
 #endif
 
-/** @def VMCPU_ASSERT_EMT_OR_RESET
+/** @def VMCPU_ASSERT_EMT_OR_NOT_RUNNING
  * Asserts that the current thread IS the emulation thread (EMT) of the
- * specified virtual CPU.
+ * specified virtual CPU when the VM is running.
  */
 #if defined(IN_RC) || defined(IN_RING0)
-# define VMCPU_ASSERT_EMT_OR_RESET(pVCpu)   Assert(   VMCPU_IS_EMT(pVCpu) \
-                                                   || pVCpu->CTX_SUFF(pVM)->enmVMState == VMSTATE_RESETTING \
-                                                   || pVCpu->CTX_SUFF(pVM)->enmVMState == VMSTATE_RESETTING_LS )
+# define VMCPU_ASSERT_EMT_OR_NOT_RUNNING(pVCpu) \
+    Assert(   VMCPU_IS_EMT(pVCpu) \
+           || pVCpu->CTX_SUFF(pVM)->enmVMState == VMSTATE_RUNNING \
+           || pVCpu->CTX_SUFF(pVM)->enmVMState == VMSTATE_RUNNING_LS \
+           || pVCpu->CTX_SUFF(pVM)->enmVMState == VMSTATE_RUNNING_FT )
 #else
-# define VMCPU_ASSERT_EMT_OR_RESET(pVCpu) \
+# define VMCPU_ASSERT_EMT_OR_NOT_RUNNING(pVCpu) \
     AssertMsg(   VMCPU_IS_EMT(pVCpu) \
-              || pVCpu->CTX_SUFF(pVM)->enmVMState == VMSTATE_RESETTING \
-              || pVCpu->CTX_SUFF(pVM)->enmVMState == VMSTATE_RESETTING_LS, \
+              || pVCpu->CTX_SUFF(pVM)->enmVMState == VMSTATE_RUNNING \
+              || pVCpu->CTX_SUFF(pVM)->enmVMState == VMSTATE_RUNNING_LS \
+              || pVCpu->CTX_SUFF(pVM)->enmVMState == VMSTATE_RUNNING_FT, \
               ("Not emulation thread! Thread=%RTnthrd ThreadEMT=%RTnthrd idCpu=%#x\n", \
                RTThreadNativeSelf(), (pVCpu)->hNativeThread, (pVCpu)->idCpu))

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

@@ -2232 +2232 @@
 VMM_INT_DECL(void) PGMNotifyNxeChanged(PVMCPU pVCpu, bool fNxe)
 {
-    VMCPU_ASSERT_EMT_OR_RESET(pVCpu);
+    VMCPU_ASSERT_EMT_OR_NOT_RUNNING(pVCpu);
     Log(("PGMNotifyNxeChanged: fNxe=%RTbool\n", fNxe));