diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-02-20 14:43:31 +0100 |
|---|---|---|
| committer | Stefan Weil <sw@weilnetz.de> | 2013-04-12 18:27:16 +0200 |
| commit | 0727b867542eea7fedfd2c53568e9782627fd3bd (patch) | |
| tree | cb57f294e4de0bfd0e87a81e2b594c4946abc5d3 /qemu-timer.c | |
| parent | 1046127d1fcc69359b3f5a44de08e6c5b16c90bc (diff) | |
| download | focaccia-qemu-0727b867542eea7fedfd2c53568e9782627fd3bd.tar.gz focaccia-qemu-0727b867542eea7fedfd2c53568e9782627fd3bd.zip | |
qemu-timer: move timeBeginPeriod/timeEndPeriod to os-win32
These are needed for any of the Win32 alarm timer implementations. They are not tied to mmtimer exclusively. Jacob tested this patch with both mmtimer and Win32 timers. Cc: qemu-stable@nongnu.org Tested-by: Jacob Kroon <jacob.kroon@gmail.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Stefan Weil <sw@weilnetz.de>
Diffstat (limited to 'qemu-timer.c')
| -rw-r--r-- | qemu-timer.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/qemu-timer.c b/qemu-timer.c index 8fb5c75df7..b2d95e2fec 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -624,28 +624,14 @@ static void CALLBACK mm_alarm_handler(UINT uTimerID, UINT uMsg, static int mm_start_timer(struct qemu_alarm_timer *t) { 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; } 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) @@ -657,7 +643,9 @@ static void mm_rearm_timer(struct qemu_alarm_timer *t, int64_t delta) nearest_delta_ms = mm_tc.wPeriodMax; } - timeKillEvent(mm_timer); + if (mm_timer) { + timeKillEvent(mm_timer); + } mm_timer = timeSetEvent((UINT)nearest_delta_ms, mm_tc.wPeriodMin, mm_alarm_handler, |