|
@@ -624,28 +624,14 @@ static void CALLBACK mm_alarm_handler(UINT uTimerID, UINT uMsg,
|
|
static int mm_start_timer(struct qemu_alarm_timer *t)
|
|
static int mm_start_timer(struct qemu_alarm_timer *t)
|
|
{
|
|
{
|
|
timeGetDevCaps(&mm_tc, sizeof(mm_tc));
|
|
timeGetDevCaps(&mm_tc, sizeof(mm_tc));
|
|
-
|
|
|
|
- timeBeginPeriod(mm_tc.wPeriodMin);
|
|
|
|
-
|
|
|
|
- mm_timer = timeSetEvent(mm_tc.wPeriodMin, /* interval (ms) */
|
|
|
|
- mm_tc.wPeriodMin, /* resolution */
|
|
|
|
- mm_alarm_handler, /* function */
|
|
|
|
- (DWORD_PTR)t, /* parameter */
|
|
|
|
- TIME_ONESHOT | TIME_CALLBACK_FUNCTION);
|
|
|
|
-
|
|
|
|
- if (!mm_timer) {
|
|
|
|
- fprintf(stderr, "Failed to initialize win32 alarm timer\n");
|
|
|
|
- timeEndPeriod(mm_tc.wPeriodMin);
|
|
|
|
- return -1;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
static void mm_stop_timer(struct qemu_alarm_timer *t)
|
|
static void mm_stop_timer(struct qemu_alarm_timer *t)
|
|
{
|
|
{
|
|
- timeKillEvent(mm_timer);
|
|
|
|
- timeEndPeriod(mm_tc.wPeriodMin);
|
|
|
|
|
|
+ if (mm_timer) {
|
|
|
|
+ timeKillEvent(mm_timer);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
static void mm_rearm_timer(struct qemu_alarm_timer *t, int64_t delta)
|
|
static void mm_rearm_timer(struct qemu_alarm_timer *t, int64_t delta)
|
|
@@ -657,7 +643,9 @@ static void mm_rearm_timer(struct qemu_alarm_timer *t, int64_t delta)
|
|
nearest_delta_ms = mm_tc.wPeriodMax;
|
|
nearest_delta_ms = mm_tc.wPeriodMax;
|
|
}
|
|
}
|
|
|
|
|
|
- timeKillEvent(mm_timer);
|
|
|
|
|
|
+ if (mm_timer) {
|
|
|
|
+ timeKillEvent(mm_timer);
|
|
|
|
+ }
|
|
mm_timer = timeSetEvent((UINT)nearest_delta_ms,
|
|
mm_timer = timeSetEvent((UINT)nearest_delta_ms,
|
|
mm_tc.wPeriodMin,
|
|
mm_tc.wPeriodMin,
|
|
mm_alarm_handler,
|
|
mm_alarm_handler,
|