From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37057) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y99wO-0003uq-A1 for qemu-devel@nongnu.org; Thu, 08 Jan 2015 05:03:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y99wH-0002MS-B9 for qemu-devel@nongnu.org; Thu, 08 Jan 2015 05:03:44 -0500 Received: from mail-we0-x22e.google.com ([2a00:1450:400c:c03::22e]:37845) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y99wH-0002LN-4a for qemu-devel@nongnu.org; Thu, 08 Jan 2015 05:03:37 -0500 Received: by mail-we0-f174.google.com with SMTP id k48so1558858wev.5 for ; Thu, 08 Jan 2015 02:03:36 -0800 (PST) Received: from playground.station (net-37-117-147-67.cust.vodafonedsl.it. [37.117.147.67]) by mx.google.com with ESMTPSA id qg11sm21175327wic.17.2015.01.08.02.03.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Jan 2015 02:03:35 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 8 Jan 2015 11:03:25 +0100 Message-Id: <1420711408-15766-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1420711408-15766-1-git-send-email-pbonzini@redhat.com> References: <1420711408-15766-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 1/4] qemu-timer: rename timer_init to timer_init_tl List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org timer_init is not called that often. Free the name for an equivalent of timer_new. Signed-off-by: Paolo Bonzini --- include/block/aio.h | 2 +- include/qemu/timer.h | 10 +++++----- qemu-timer.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/block/aio.h b/include/block/aio.h index 6bf0e04..7d1e26b 100644 --- a/include/block/aio.h +++ b/include/block/aio.h @@ -314,7 +314,7 @@ static inline void aio_timer_init(AioContext *ctx, int scale, QEMUTimerCB *cb, void *opaque) { - timer_init(ts, ctx->tlg.tl[type], scale, cb, opaque); + timer_init_tl(ts, ctx->tlg.tl[type], scale, cb, opaque); } /** diff --git a/include/qemu/timer.h b/include/qemu/timer.h index d9df094..0666920 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -410,7 +410,7 @@ int64_t timerlistgroup_deadline_ns(QEMUTimerListGroup *tlg); */ /** - * timer_init: + * timer_init_tl: * @ts: the timer to be initialised * @timer_list: the timer list to attach the timer to * @scale: the scale value for the timer @@ -423,9 +423,9 @@ int64_t timerlistgroup_deadline_ns(QEMUTimerListGroup *tlg); * You need not call an explicit deinit call. Simply make * sure it is not on a list with timer_del. */ -void timer_init(QEMUTimer *ts, - QEMUTimerList *timer_list, int scale, - QEMUTimerCB *cb, void *opaque); +void timer_init_tl(QEMUTimer *ts, + QEMUTimerList *timer_list, int scale, + QEMUTimerCB *cb, void *opaque); /** * timer_new_tl: @@ -448,7 +448,7 @@ static inline QEMUTimer *timer_new_tl(QEMUTimerList *timer_list, void *opaque) { QEMUTimer *ts = g_malloc0(sizeof(QEMUTimer)); - timer_init(ts, timer_list, scale, cb, opaque); + timer_init_tl(ts, timer_list, scale, cb, opaque); return ts; } diff --git a/qemu-timer.c b/qemu-timer.c index cb7d988..98d9d1b 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -331,9 +331,9 @@ int qemu_poll_ns(GPollFD *fds, guint nfds, int64_t timeout) } -void timer_init(QEMUTimer *ts, - QEMUTimerList *timer_list, int scale, - QEMUTimerCB *cb, void *opaque) +void timer_init_tl(QEMUTimer *ts, + QEMUTimerList *timer_list, int scale, + QEMUTimerCB *cb, void *opaque) { ts->timer_list = timer_list; ts->cb = cb; -- 2.1.0