From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54868) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V7XzB-0006nT-Hw for qemu-devel@nongnu.org; Thu, 08 Aug 2013 17:43:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V7XzA-00079E-II for qemu-devel@nongnu.org; Thu, 08 Aug 2013 17:43:09 -0400 Received: from mail.avalus.com ([2001:41c8:10:1dd::10]:47006) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V7Xz9-00078b-Rq for qemu-devel@nongnu.org; Thu, 08 Aug 2013 17:43:08 -0400 From: Alex Bligh Date: Thu, 8 Aug 2013 22:42:18 +0100 Message-Id: <1375998147-24292-22-git-send-email-alex@alex.org.uk> In-Reply-To: <1375998147-24292-1-git-send-email-alex@alex.org.uk> References: <1375998147-24292-1-git-send-email-alex@alex.org.uk> Subject: [Qemu-devel] [RFC] [PATCHv8 21/30] aio / timers: Remove legacy qemu_clock_deadline & qemu_timerlist_deadline List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Anthony Liguori , Alex Bligh , liu ping fan , Stefan Hajnoczi , Paolo Bonzini , MORITA Kazutaka , rth@twiddle.net 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 f873d87..fedd7f1 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -126,7 +126,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: @@ -229,21 +228,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 9dafc6c..81d5d8c 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -179,26 +179,6 @@ bool qemu_clock_expired(QEMUClock *clock) return timerlist_expired(clock->main_loop_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->main_loop_timerlist); -} - /* * As above, but return -1 for no deadline, and do not cap to 2^32 * as we know the result is always positive. -- 1.7.9.5