Changeset 37357 in vbox

Timestamp:

Jun 7, 2011 5:10:10 PM (14 years ago)

Author:

vboxsync

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

72125

Message:

PGM: relax some assertion added earlier today so they'll survive reset and guru mediations.

Location:

trunk

Files:

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

trunk/include/VBox/vmm/pdmusb.h

@@ -903 +903 @@
     MMR3HeapFree(pv);
 }
+
+/**
+ * @copydoc PDMUSBHLP::pfnTMTimerCreate
+ */
+DECLINLINE(int) PDMUsbHlpTMTimerCreate(PPDMUSBINS pUsbIns, TMCLOCK enmClock, PFNTMTIMERUSB pfnCallback, void *pvUser,
+                                       uint32_t fFlags, const char *pszDesc, PPTMTIMERR3 ppTimer)
+{
+    return pUsbIns->pHlpR3->pfnTMTimerCreate(pUsbIns, enmClock, pfnCallback, pvUser, fFlags, pszDesc, ppTimer);
+}
 #endif /* IN_RING3 */
 

trunk/include/VBox/vmm/vm.h

@@ -628 +628 @@
 #endif
 
+/** @def VMCPU_ASSERT_EMT_OR_GURU
+ * Asserts that the current thread IS the emulation thread (EMT) of the
+ * specified virtual CPU.
+ */
+#if defined(IN_RC) || defined(IN_RING0)
+# define VMCPU_ASSERT_EMT_OR_GURU(pVCpu)    Assert(   VMCPU_IS_EMT(pVCpu) \
+                                                   || pVCpu->CTX_SUFF(pVM)->enmVMState == VMSTATE_GURU_MEDITATION \
+                                                   || pVCpu->CTX_SUFF(pVM)->enmVMState == VMSTATE_GURU_MEDITATION_LS )
+#else
+# define VMCPU_ASSERT_EMT_OR_GURU(pVCpu) \
+    AssertMsg(   VMCPU_IS_EMT(pVCpu) \
+              || pVCpu->CTX_SUFF(pVM)->enmVMState == VMSTATE_GURU_MEDITATION \
+              || pVCpu->CTX_SUFF(pVM)->enmVMState == VMSTATE_GURU_MEDITATION_LS, \
+              ("Not emulation thread! Thread=%RTnthrd ThreadEMT=%RTnthrd idCpu=%#x\n", \
+               RTThreadNativeSelf(), (pVCpu)->hNativeThread, (pVCpu)->idCpu))
+#endif
+
+/** @def VMCPU_ASSERT_EMT_OR_RESET
+ * Asserts that the current thread IS the emulation thread (EMT) of the
+ * specified virtual CPU.
+ */
+#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 )
+#else
+# define VMCPU_ASSERT_EMT_OR_RESET(pVCpu) \
+    AssertMsg(   VMCPU_IS_EMT(pVCpu) \
+              || pVCpu->CTX_SUFF(pVM)->enmVMState == VMSTATE_RESETTING \
+              || pVCpu->CTX_SUFF(pVM)->enmVMState == VMSTATE_RESETTING_LS, \
+              ("Not emulation thread! Thread=%RTnthrd ThreadEMT=%RTnthrd idCpu=%#x\n", \
+               RTThreadNativeSelf(), (pVCpu)->hNativeThread, (pVCpu)->idCpu))
+#endif
+
 /** @def VM_ASSERT_EMT0
  * Asserts that the current thread IS emulation thread \#0 (EMT0).

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

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

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

@@ -2820 +2820 @@
 {
     PVM pVM = pVCpu->CTX_SUFF(pVM);
-    VMCPU_ASSERT_EMT(pVCpu);
+    VMCPU_ASSERT_EMT_OR_GURU(pVCpu);
 
     /*