haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

qemu-timer: rename timer_init to timer_init_tl

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

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2014-12-23 21:54:14 +01:00
parent 488eef2f1d
commit f186aa976b
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/block/aio.h
View file

@ -314,7 +314,7 @@ static inline void aio_timer_init(AioContext *ctx,
int scale, int scale,
QEMUTimerCB *cb, void *opaque) 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);
} }
/** /**

10
include/qemu/timer.h
View file

@ -410,7 +410,7 @@ int64_t timerlistgroup_deadline_ns(QEMUTimerListGroup *tlg);
*/ */
/** /**
* timer_init: * timer_init_tl:
* @ts: the timer to be initialised * @ts: the timer to be initialised
* @timer_list: the timer list to attach the timer to * @timer_list: the timer list to attach the timer to
* @scale: the scale value for the timer * @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 * You need not call an explicit deinit call. Simply make
* sure it is not on a list with timer_del. * 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, QEMUTimerList *timer_list, int scale,
QEMUTimerCB *cb, void *opaque); QEMUTimerCB *cb, void *opaque);
/** /**
* timer_new_tl: * timer_new_tl:
@ -448,7 +448,7 @@ static inline QEMUTimer *timer_new_tl(QEMUTimerList *timer_list,
void *opaque) void *opaque)
{ {
QEMUTimer *ts = g_malloc0(sizeof(QEMUTimer)); 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; return ts;
} }

6
qemu-timer.c
View file

@ -331,9 +331,9 @@ 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, QEMUTimerList *timer_list, int scale,
QEMUTimerCB *cb, void *opaque) QEMUTimerCB *cb, void *opaque)
{ {
ts->timer_list = timer_list; ts->timer_list = timer_list;
ts->cb = cb; ts->cb = cb;