From patchwork Fri Apr 13 18:35:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 152377 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1395FB7022 for ; Sat, 14 Apr 2012 04:31:37 +1000 (EST) Received: from localhost ([::1]:48541 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SIlHS-0004qR-Tl for incoming@patchwork.ozlabs.org; Fri, 13 Apr 2012 14:31:34 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44116) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SIlGw-0003Zo-1m for qemu-devel@nongnu.org; Fri, 13 Apr 2012 14:31:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SIlGu-0006Da-8L for qemu-devel@nongnu.org; Fri, 13 Apr 2012 14:31:01 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:6091) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SIlGu-0006D7-4f for qemu-devel@nongnu.org; Fri, 13 Apr 2012 14:31:00 -0400 X-IronPort-AV: E=Sophos;i="4.75,418,1330923600"; d="scan'208";a="190286922" Received: from ftlpmailmx02.citrite.net ([10.13.107.66]) by FTLPIPO02.CITRIX.COM with ESMTP/TLS/RC4-MD5; 13 Apr 2012 14:30:56 -0400 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.66) with Microsoft SMTP Server id 8.3.213.0; Fri, 13 Apr 2012 14:30:56 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59] helo=localhost.localdomain) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1SIlGk-0003Dp-QU; Fri, 13 Apr 2012 19:30:50 +0100 From: Stefano Stabellini To: qemu-devel@nongnu.org Date: Fri, 13 Apr 2012 19:35:03 +0100 Message-ID: <1334342104-30546-4-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.63 Cc: pbonzini@redhat.com, xen-devel@lists.xensource.com, jan.kiszka@siemens.com, avi@redhat.com, Stefano Stabellini Subject: [Qemu-devel] [PATCH v6 4/5] 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 fe4cd6f..1166beb 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) {