From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35021) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VC9wZ-0008P7-AD for qemu-devel@nongnu.org; Wed, 21 Aug 2013 11:03:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VC9wV-0004Ft-Na for qemu-devel@nongnu.org; Wed, 21 Aug 2013 11:03:31 -0400 Received: from mail.avalus.com ([2001:41c8:10:1dd::10]:37361) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VC9wV-0004DK-Eh for qemu-devel@nongnu.org; Wed, 21 Aug 2013 11:03:27 -0400 From: Alex Bligh Date: Wed, 21 Aug 2013 16:02:42 +0100 Message-Id: <1377097389-27335-5-git-send-email-alex@alex.org.uk> In-Reply-To: <1377097389-27335-1-git-send-email-alex@alex.org.uk> References: <1377097389-27335-1-git-send-email-alex@alex.org.uk> Subject: [Qemu-devel] [PATCHv13 04/31] aio / timers: Consistent treatment of disabled clocks for deadlines List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Anthony Liguori , Alex Bligh , Jan Kiszka , liu ping fan , Stefan Hajnoczi , Paolo Bonzini , MORITA Kazutaka , rth@twiddle.net Make treatment of disabled clocks consistent in deadline calculation Signed-off-by: Alex Bligh --- qemu-timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu-timer.c b/qemu-timer.c index df8f12b..be29adf 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -264,7 +264,7 @@ int64_t qemu_clock_deadline(QEMUClock *clock) /* To avoid problems with overflow limit this to 2^32. */ int64_t delta = INT32_MAX; - if (clock->active_timers) { + if (clock->enabled && clock->active_timers) { delta = clock->active_timers->expire_time - qemu_get_clock_ns(clock); } if (delta < 0) { -- 1.7.9.5