From patchwork Tue Jan 31 16:12:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 138801 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 073C8B71A6 for ; Wed, 1 Feb 2012 03:11:49 +1100 (EST) Received: from localhost ([::1]:53792 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RsGJ9-00057C-U8 for incoming@patchwork.ozlabs.org; Tue, 31 Jan 2012 11:11:47 -0500 Received: from eggs.gnu.org ([140.186.70.92]:39569) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RsGIo-0004SD-5t for qemu-devel@nongnu.org; Tue, 31 Jan 2012 11:11:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RsGIi-0002IF-6h for qemu-devel@nongnu.org; Tue, 31 Jan 2012 11:11:26 -0500 Received: from smtp.citrix.com ([66.165.176.89]:30726) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RsGIi-0002I7-2k for qemu-devel@nongnu.org; Tue, 31 Jan 2012 11:11:20 -0500 X-IronPort-AV: E=Sophos;i="4.71,596,1320642000"; d="scan'208";a="21462328" Received: from ftlpmailmx01.citrite.net ([10.13.107.65]) by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 31 Jan 2012 11:11:19 -0500 Received: from smtp01.ad.xensource.com (10.219.128.104) by smtprelay.citrix.com (10.13.107.65) with Microsoft SMTP Server id 8.3.213.0; Tue, 31 Jan 2012 11:11:18 -0500 Received: from localhost.localdomain (kaball.uk.xensource.com [10.80.2.59]) by smtp01.ad.xensource.com (8.13.1/8.13.1) with ESMTP id q0VGAvVs032535; Tue, 31 Jan 2012 08:11:07 -0800 From: Stefano Stabellini To: xen-devel@lists.xensource.com Date: Tue, 31 Jan 2012 16:12:53 +0000 Message-ID: <1328026374-12803-5-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.89 Cc: Stefano Stabellini , jan.kiszka@siemens.com, qemu-devel@nongnu.org, avi@redhat.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH v4 5/6] qemu_next_alarm_deadline: check the expire time of a clock only if it is enabled X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- qemu-timer.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/qemu-timer.c b/qemu-timer.c index 29410f1..de20852 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) {