From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59592) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VCbFY-0004iV-ET for qemu-devel@nongnu.org; Thu, 22 Aug 2013 16:12:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VCbFV-0004W9-WA for qemu-devel@nongnu.org; Thu, 22 Aug 2013 16:12:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:31669) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VCbFV-0004Vy-NY for qemu-devel@nongnu.org; Thu, 22 Aug 2013 16:12:53 -0400 From: Stefan Hajnoczi Date: Thu, 22 Aug 2013 22:11:26 +0200 Message-Id: <1377202298-22896-31-git-send-email-stefanha@redhat.com> In-Reply-To: <1377202298-22896-1-git-send-email-stefanha@redhat.com> References: <1377202298-22896-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 30/42] 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: Stefan Hajnoczi , Alex Bligh , Anthony Liguori From: Alex Bligh Remove qemu_clock_deadline and qemu_timerlist_deadline now we are using the ns functions throughout. Signed-off-by: Alex Bligh Signed-off-by: Stefan Hajnoczi --- 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 d0fb7b6..21f4810 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -140,7 +140,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: @@ -246,21 +245,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 8ea8211..b6f9304 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -176,26 +176,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.8.3.1