From patchwork Tue Aug 6 23:49:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Bligh X-Patchwork-Id: 265278 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 861162C0092 for ; Wed, 7 Aug 2013 09:56:58 +1000 (EST) Received: from localhost ([::1]:36706 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6r7Y-0004Km-Gd for incoming@patchwork.ozlabs.org; Tue, 06 Aug 2013 19:56:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59307) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6r0l-0001z4-96 for qemu-devel@nongnu.org; Tue, 06 Aug 2013 19:49:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V6r0k-0001Vo-3Y for qemu-devel@nongnu.org; Tue, 06 Aug 2013 19:49:55 -0400 Received: from mail.avalus.com ([2001:41c8:10:1dd::10]:44708) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6r0j-0001Vc-Sj for qemu-devel@nongnu.org; Tue, 06 Aug 2013 19:49:54 -0400 Received: by mail.avalus.com (Postfix) with ESMTPSA id E29A7C561BD; Wed, 7 Aug 2013 00:49:52 +0100 (BST) From: Alex Bligh To: qemu-devel@nongnu.org Date: Wed, 7 Aug 2013 00:49:16 +0100 Message-Id: <1375832956-7588-23-git-send-email-alex@alex.org.uk> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1375832956-7588-1-git-send-email-alex@alex.org.uk> References: <1375832956-7588-1-git-send-email-alex@alex.org.uk> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:41c8:10:1dd::10 Cc: Kevin Wolf , Anthony Liguori , Alex Bligh , liu ping fan , Stefan Hajnoczi , Paolo Bonzini , MORITA Kazutaka , rth@twiddle.net Subject: [Qemu-devel] [RFC] [PATCHv7 22/22] aio / timers: Remove legacy qemu_clock_deadline & qemu_timerlist_deadline 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 Remove qemu_clock_deadline and qemu_timerlist_deadline now we are using the ns functions throughout. Signed-off-by: Alex Bligh --- include/qemu/timer.h | 16 ---------------- qemu-timer.c | 20 -------------------- 2 files changed, 36 deletions(-) diff --git a/include/qemu/timer.h b/include/qemu/timer.h index 21c1b04..9989d0e 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -144,7 +144,6 @@ bool qemu_clock_has_timers(QEMUClock *clock); * an expired timer */ bool qemu_clock_expired(QEMUClock *clock); -int64_t qemu_clock_deadline(QEMUClock *clock); /** * qemu_clock_deadline_ns: @@ -247,21 +246,6 @@ bool timerlist_has_timers(QEMUTimerList *timer_list); bool timerlist_expired(QEMUTimerList *timer_list); /** - * timerlist_deadline: - * @timer_list: the timer list to operate on - * - * Determine the deadline for a timer_list. This is - * a legacy function which returns INT32_MAX if the - * timer list has no timers or if the earliest timer - * expires later than INT32_MAX nanoseconds away. - * - * Returns: the number of nanoseconds until the earliest - * timer expires or INT32_MAX in the situations listed - * above - */ -int64_t timerlist_deadline(QEMUTimerList *timer_list); - -/** * timerlist_deadline_ns: * @timer_list: the timer list to operate on * diff --git a/qemu-timer.c b/qemu-timer.c index a6b274c..491b6d6 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -185,26 +185,6 @@ bool qemu_clock_expired(QEMUClock *clock) return timerlist_expired(clock->default_timerlist); } -int64_t timerlist_deadline(QEMUTimerList *timer_list) -{ - /* To avoid problems with overflow limit this to 2^32. */ - int64_t delta = INT32_MAX; - - if (timer_list->clock->enabled && timer_list->active_timers) { - delta = timer_list->active_timers->expire_time - - qemu_get_clock_ns(timer_list->clock); - } - if (delta < 0) { - delta = 0; - } - return delta; -} - -int64_t qemu_clock_deadline(QEMUClock *clock) -{ - return timerlist_deadline(clock->default_timerlist); -} - /* * As above, but return -1 for no deadline, and do not cap to 2^32 * as we know the result is always positive.