diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2017-01-27 12:54:50 +0400 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2017-03-01 00:09:28 +0400 |
| commit | e703dcbaeef6973e788a9a8d19e53094b50c0a7c (patch) | |
| tree | 8d4cdfbf1d4e9c7f0b9198a19427719059920353 | |
| parent | 14324f585d76abd8a609c119d627503e6a0961be (diff) | |
timer: use an inline function for free
Similarly to allocation, do it from an inline function. This allows
tests to only use the headers for allocation/free of timer.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | include/qemu/timer.h | 5 | ||||
| -rw-r--r-- | util/qemu-timer.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/include/qemu/timer.h b/include/qemu/timer.h index 9abed51ae8..26e628584c 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -610,7 +610,10 @@ void timer_deinit(QEMUTimer *ts); * * Free a timer (it must not be on the active list) */ -void timer_free(QEMUTimer *ts); +static inline void timer_free(QEMUTimer *ts) +{ + g_free(ts); +} /** * timer_del: diff --git a/util/qemu-timer.c b/util/qemu-timer.c index ff620ecff7..6cf70b96f6 100644 --- a/util/qemu-timer.c +++ b/util/qemu-timer.c @@ -355,11 +355,6 @@ void timer_deinit(QEMUTimer *ts) ts->timer_list = NULL; } -void timer_free(QEMUTimer *ts) -{ - g_free(ts); -} - static void timer_del_locked(QEMUTimerList *timer_list, QEMUTimer *ts) { QEMUTimer **pt, *t; |