mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

timers: the rearm function should be able to handle delta = INT64_MAX

Browse Source 
Fix win32_rearm_timer and mm_rearm_timer: they should be able to handle
INT64_MAX as a delta parameter without overflowing.
Also, the next deadline in ms should be calculated rounding down rather
than up (see unix_rearm_timer and dynticks_rearm_timer).

Finally ChangeTimerQueueTimer takes an unsigned long and timeSetEvent
takes an unsigned int as delta, so cast the ms delta to the appropriate
unsigned integer.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Stefano Stabellini 2012-04-13 19:35:02 +01:00 committed by Anthony Liguori
parent 4ed5f5ea45
commit 5bfb723f07
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
qemu-timer.c
View File

@ -696,13 +696,17 @@ static void mm_stop_timer(struct qemu_alarm_timer *t)
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)
{ {
int nearest_delta_ms = (delta + 999999) / 1000000; int64_t nearest_delta_ms = delta / 1000000;
if (nearest_delta_ms < 1) { if (nearest_delta_ms < 1) {
nearest_delta_ms = 1; nearest_delta_ms = 1;
} }
/* UINT_MAX can be 32 bit */
if (nearest_delta_ms > UINT_MAX) {
nearest_delta_ms = UINT_MAX;
}
timeKillEvent(mm_timer); timeKillEvent(mm_timer);
mm_timer = timeSetEvent(nearest_delta_ms, mm_timer = timeSetEvent((unsigned int) nearest_delta_ms,
mm_period, mm_period,
mm_alarm_handler, mm_alarm_handler,
(DWORD_PTR)t, (DWORD_PTR)t,
@ -757,16 +761,20 @@ static void win32_rearm_timer(struct qemu_alarm_timer *t,
int64_t nearest_delta_ns) int64_t nearest_delta_ns)
{ {
HANDLE hTimer = t->timer; HANDLE hTimer = t->timer;
int nearest_delta_ms; int64_t nearest_delta_ms;
BOOLEAN success; BOOLEAN success;
nearest_delta_ms = (nearest_delta_ns + 999999) / 1000000; nearest_delta_ms = nearest_delta_ns / 1000000;
if (nearest_delta_ms < 1) { if (nearest_delta_ms < 1) {
nearest_delta_ms = 1; nearest_delta_ms = 1;
} }
/* ULONG_MAX can be 32 bit */
if (nearest_delta_ms > ULONG_MAX) {
nearest_delta_ms = ULONG_MAX;
}
success = ChangeTimerQueueTimer(NULL, success = ChangeTimerQueueTimer(NULL,
hTimer, hTimer,
nearest_delta_ms, (unsigned long) nearest_delta_ms,
3600000); 3600000);
if (!success) { if (!success) {