[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 4/5] qemu_next_alarm_deadline: check the expire t
From: |
Stefano Stabellini |
Subject: |
[Qemu-devel] [PATCH v2 4/5] qemu_next_alarm_deadline: check the expire time of a clock only if it is enabled |
Date: |
Fri, 27 Jan 2012 12:26:54 +0000 |
Also delta in qemu_next_alarm_deadline is a 64 bit value so set the
default to INT64_MAX instead of INT32_MAX.
Signed-off-by: Stefano Stabellini <address@hidden>
---
qemu-timer.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/qemu-timer.c b/qemu-timer.c
index cd026c6..648db1d 100644
--- a/qemu-timer.c
+++ b/qemu-timer.c
@@ -106,23 +106,21 @@ static inline int alarm_has_dynticks(struct
qemu_alarm_timer *t)
static int64_t qemu_next_alarm_deadline(void)
{
- int64_t delta;
+ int64_t delta = INT64_MAX;
int64_t rtdelta;
- if (!use_icount && vm_clock->active_timers) {
+ if (!use_icount && vm_clock->enabled && vm_clock->active_timers) {
delta = vm_clock->active_timers->expire_time -
qemu_get_clock_ns(vm_clock);
- } else {
- delta = INT32_MAX;
}
- if (host_clock->active_timers) {
+ if (host_clock->enabled && host_clock->active_timers) {
int64_t hdelta = host_clock->active_timers->expire_time -
qemu_get_clock_ns(host_clock);
if (hdelta < delta) {
delta = hdelta;
}
}
- if (rt_clock->active_timers) {
+ if (rt_clock->enabled && rt_clock->active_timers) {
rtdelta = (rt_clock->active_timers->expire_time -
qemu_get_clock_ns(rt_clock));
if (rtdelta < delta) {
--
1.7.2.5
- [Qemu-devel] [PATCH v2 0/5] prevent Qemu from waking up needlessly, Stefano Stabellini, 2012/01/27
- [Qemu-devel] [PATCH v2 1/5] xen: do not initialize the interval timer emulator, Stefano Stabellini, 2012/01/27
- [Qemu-devel] [PATCH v2 2/5] xen: disable rtc_clock, Stefano Stabellini, 2012/01/27
- Re: [Qemu-devel] [PATCH v2 2/5] xen: disable rtc_clock, Paolo Bonzini, 2012/01/27
- Re: [Qemu-devel] [PATCH v2 2/5] xen: disable rtc_clock, Stefano Stabellini, 2012/01/30
- Re: [Qemu-devel] [PATCH v2 2/5] xen: disable rtc_clock, Paolo Bonzini, 2012/01/30
- Re: [Qemu-devel] [PATCH v2 2/5] xen: disable rtc_clock, Stefano Stabellini, 2012/01/30
- Re: [Qemu-devel] [PATCH v2 2/5] xen: disable rtc_clock, Anthony Liguori, 2012/01/30
- Re: [Qemu-devel] [PATCH v2 2/5] xen: disable rtc_clock, Paolo Bonzini, 2012/01/31
[Qemu-devel] [PATCH v2 4/5] qemu_next_alarm_deadline: check the expire time of a clock only if it is enabled,
Stefano Stabellini <=
[Qemu-devel] [PATCH v2 3/5] xen: introduce an event channel for buffered io event notifications, Stefano Stabellini, 2012/01/27
[Qemu-devel] [PATCH v2 5/5] qemu_calculate_timeout: increase minimum timeout to 1h, Stefano Stabellini, 2012/01/27