Commit f186aa97 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

qemu-timer: rename timer_init to timer_init_tl 



timer_init is not called that often.  Free the name for an equivalent
of timer_new.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 488eef2f

include/block/aio.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

}



/**

include/qemu/timer.h

+5 −5
Original line number Diff line number Diff line
@@ -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,7 +423,7 @@ 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,

void timer_init_tl(QEMUTimer *ts,

                   QEMUTimerList *timer_list, int scale,

                   QEMUTimerCB *cb, void *opaque);
@@ -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;

}

qemu-timer.c

+3 −3
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ int qemu_poll_ns(GPollFD *fds, guint nfds, int64_t timeout) 
}





void timer_init(QEMUTimer *ts,

void timer_init_tl(QEMUTimer *ts,

                   QEMUTimerList *timer_list, int scale,

                   QEMUTimerCB *cb, void *opaque)

{