Changeset 38195 in vbox for trunk/src/VBox

Timestamp:

Jul 27, 2011 11:21:13 AM (14 years ago)

Author:

vboxsync

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

73159

Message:

rtcLoadExec: Avoid asserting in TMTimerSetFrequencyHint.

File:

• trunk/src/VBox/Devices/PC/DevRTC.cpp (modified) (1 diff)

trunk/src/VBox/Devices/PC/DevRTC.cpp

@@ -786 +786 @@
     int period_code = pThis->cmos_data[RTC_REG_A] & 0x0f;
     if (    period_code != 0
-        &&  (pThis->cmos_data[RTC_REG_B] & REG_B_PIE)) {
+        &&  (pThis->cmos_data[RTC_REG_B] & REG_B_PIE))
+    {
         if (period_code <= 2)
             period_code += 7;
         int period = 1 << (period_code - 1);
         LogRel(("RTC: period=%#x (%d) %u Hz (restore)\n", period, period, _32K / period));
+        PDMCritSectEnter(pThis->pDevInsR3->pCritSectRoR3, VINF_SUCCESS);
         TMTimerSetFrequencyHint(pThis->CTX_SUFF(pPeriodicTimer), _32K / period);
+        PDMCritSectLeave(pThis->pDevInsR3->pCritSectRoR3);
         pThis->CurLogPeriod  = period;
         pThis->CurHintPeriod = period;
-    } else {
+    }
+    else
+    {
         LogRel(("RTC: stopped the periodic timer (restore)\n"));
         pThis->CurLogPeriod  = 0;