diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-02-20 14:43:31 +0100 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2013-05-16 17:22:34 -0500 |
| commit | 06efdc4f4d5ba24016c33ff0690218027c0c785f (patch) | |
| tree | ed24d0f8540bcfe0c41c28deddd645969633c0a6 | |
| parent | 0c70b5ad59133a5dbddd455f6d395bf3e8140ff7 (diff) | |
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>
(cherry picked from commit 0727b867542eea7fedfd2c53568e9782627fd3bd)
Conflicts:
os-win32.c
* updated to retain cpu affinity settings for 1.4
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | os-win32.c | 12 | ||||
| -rw-r--r-- | qemu-timer.c | 24 |
2 files changed, 18 insertions, 18 deletions
diff --git a/os-win32.c b/os-win32.c index 9673a81c7d..914c770ecf 100644 --- a/os-win32.c +++ b/os-win32.c @@ -23,6 +23,7 @@ * THE SOFTWARE. */ #include <windows.h> +#include <mmsystem.h> #include <unistd.h> #include <fcntl.h> #include <signal.h> @@ -67,6 +68,13 @@ static BOOL WINAPI qemu_ctrl_handler(DWORD type) return TRUE; } +static TIMECAPS mm_tc; + +static void os_undo_timer_resolution(void) +{ + timeEndPeriod(mm_tc.wPeriodMin); +} + void os_setup_early_signal_handling(void) { /* Note: cpu_interrupt() is currently not SMP safe, so we force @@ -88,6 +96,10 @@ void os_setup_early_signal_handling(void) SetProcessAffinityMask(h, mask); } } + + timeGetDevCaps(&mm_tc, sizeof(mm_tc)); + timeBeginPeriod(mm_tc.wPeriodMin); + atexit(os_undo_timer_resolution); } /* Look for support files in the same directory as the executable. */ 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, |