Changeset 37324 in vbox for trunk/src/VBox/VMM

Timestamp:

Jun 3, 2011 4:28:03 PM (14 years ago)

Author:

vboxsync

Message:

TM,Devices: Fixed default critical section screwup and adjusted its usage in the devices.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/TMAll.cpp (modified) (1 diff)
• VMMR3/TM.cpp (modified) (2 diffs)

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

@@ -53 +53 @@
         if ((pTimer)->pCritSect) \
         { \
+            VMSTATE      enmState; \
             PPDMCRITSECT pCritSect = (PPDMCRITSECT)MMHyperR3ToCC((pTimer)->CTX_SUFF(pVM), (pTimer)->pCritSect); \
-            AssertMsg(pCritSect && PDMCritSectIsOwner(pCritSect), \
-                      ("pTimer=%p (%s) pCritSect=%p\n", pTimer, R3STRING(pTimer->pszDesc), (pTimer)->pCritSect)); \
+            AssertMsg(   pCritSect \
+                      && (   PDMCritSectIsOwner(pCritSect) \
+                          || (enmState = (pTimer)->CTX_SUFF(pVM)->enmVMState) == VMSTATE_CREATING \
+                          || enmState == VMSTATE_RESETTING \
+                          || enmState == VMSTATE_RESETTING_LS ),\
+                      ("pTimer=%p (%s) pCritSect=%p (%s)\n", pTimer, R3STRING(pTimer->pszDesc), \
+                       (pTimer)->pCritSect, R3STRING(PDMR3CritSectName((pTimer)->pCritSect)) )); \
         } \
     } while (0)

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

@@ -1315 +1315 @@
  * @param   ppTimer         Where to store the timer on success.
  */
-VMM_INT_DECL(int) TMR3TimerCreateDevice(PVM pVM, PPDMDEVINS pDevIns, TMCLOCK enmClock, PFNTMTIMERDEV pfnCallback, void *pvUser, uint32_t fFlags, const char *pszDesc, PPTMTIMERR3 ppTimer)
+VMM_INT_DECL(int) TMR3TimerCreateDevice(PVM pVM, PPDMDEVINS pDevIns, TMCLOCK enmClock,
+                                        PFNTMTIMERDEV pfnCallback, void *pvUser,
+                                        uint32_t fFlags, const char *pszDesc, PPTMTIMERR3 ppTimer)
 {
     AssertReturn(!(fFlags & ~(TMTIMER_FLAGS_NO_CRIT_SECT)), VERR_INVALID_PARAMETER);
@@ -1329 +1331 @@
         (*ppTimer)->u.Dev.pDevIns   = pDevIns;
         (*ppTimer)->pvUser          = pvUser;
-        if (fFlags & TMTIMER_FLAGS_DEFAULT_CRIT_SECT)
+        if (!(fFlags & TMTIMER_FLAGS_NO_CRIT_SECT))
         {
             if (pDevIns->pCritSectR3)