diff options
| author | Aurelien Jarno <aurelien@aurel32.net> | 2013-04-13 14:31:54 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2013-04-13 14:31:54 +0200 |
| commit | 75312e745ad1b672cbabdc3022f6e7c8eff69b00 (patch) | |
| tree | 5f2c92a22dbe0d149065123ea0827f5cdb76f752 /qemu-timer.c | |
| parent | d640045a3ede028293b83e57e9ae1ce4f81044b8 (diff) | |
| parent | 0727b867542eea7fedfd2c53568e9782627fd3bd (diff) | |
| download | qemu-75312e745ad1b672cbabdc3022f6e7c8eff69b00.zip qemu-75312e745ad1b672cbabdc3022f6e7c8eff69b00.tar.gz qemu-75312e745ad1b672cbabdc3022f6e7c8eff69b00.tar.bz2 | |
Merge branch 'mingw' of git://qemu.weilnetz.de/qemu
* 'mingw' of git://qemu.weilnetz.de/qemu:
qemu-timer: move timeBeginPeriod/timeEndPeriod to os-win32
Release SMP restriction on Windows
Ensure good ordering of memory instruction in cpu_exec
Check effective suspension of TCG thread
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 8fb5c75..b2d95e2 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, |