* [PATCH] qemu-timer: allow freeing a NULL timer
@ 2021-03-10 15:45 Paolo Bonzini
2021-03-10 15:53 ` Philippe Mathieu-Daudé
2021-03-11 17:06 ` Stefano Garzarella
0 siblings, 2 replies; 3+ messages in thread
From: Paolo Bonzini @ 2021-03-10 15:45 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, Markus Armbruster
Since 5f8e93c3e2 ("util/qemu-timer: Make timer_free() imply timer_del()", 2021-01-08)
it is not possible anymore to pass a NULL pointer to timer_free(). Previously
it would do nothing as it would simply pass NULL down to g_free().
Rectify this, which also fixes "-chardev braille" when there is no device.
Reported-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
include/qemu/timer.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/qemu/timer.h b/include/qemu/timer.h
index 1678238384..88ef114689 100644
--- a/include/qemu/timer.h
+++ b/include/qemu/timer.h
@@ -629,8 +629,10 @@ void timer_del(QEMUTimer *ts);
*/
static inline void timer_free(QEMUTimer *ts)
{
- timer_del(ts);
- g_free(ts);
+ if (ts) {
+ timer_del(ts);
+ g_free(ts);
+ }
}
/**
--
2.26.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] qemu-timer: allow freeing a NULL timer
2021-03-10 15:45 [PATCH] qemu-timer: allow freeing a NULL timer Paolo Bonzini
@ 2021-03-10 15:53 ` Philippe Mathieu-Daudé
2021-03-11 17:06 ` Stefano Garzarella
1 sibling, 0 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-03-10 15:53 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: peter.maydell, Markus Armbruster
On 3/10/21 4:45 PM, Paolo Bonzini wrote:
> Since 5f8e93c3e2 ("util/qemu-timer: Make timer_free() imply timer_del()", 2021-01-08)
> it is not possible anymore to pass a NULL pointer to timer_free(). Previously
> it would do nothing as it would simply pass NULL down to g_free().
>
> Rectify this, which also fixes "-chardev braille" when there is no device.
>
> Reported-by: Markus Armbruster <armbru@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> include/qemu/timer.h | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] qemu-timer: allow freeing a NULL timer
2021-03-10 15:45 [PATCH] qemu-timer: allow freeing a NULL timer Paolo Bonzini
2021-03-10 15:53 ` Philippe Mathieu-Daudé
@ 2021-03-11 17:06 ` Stefano Garzarella
1 sibling, 0 replies; 3+ messages in thread
From: Stefano Garzarella @ 2021-03-11 17:06 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: peter.maydell, qemu-devel, Markus Armbruster
On Wed, Mar 10, 2021 at 10:45:26AM -0500, Paolo Bonzini wrote:
>Since 5f8e93c3e2 ("util/qemu-timer: Make timer_free() imply timer_del()", 2021-01-08)
>it is not possible anymore to pass a NULL pointer to timer_free(). Previously
>it would do nothing as it would simply pass NULL down to g_free().
>
>Rectify this, which also fixes "-chardev braille" when there is no device.
>
>Reported-by: Markus Armbruster <armbru@redhat.com>
>Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>---
> include/qemu/timer.h | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-11 17:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-10 15:45 [PATCH] qemu-timer: allow freeing a NULL timer Paolo Bonzini
2021-03-10 15:53 ` Philippe Mathieu-Daudé
2021-03-11 17:06 ` Stefano Garzarella
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).