diff options
| author | Peter Maydell | 2020-12-15 16:41:06 +0100 |
|---|---|---|
| committer | Peter Maydell | 2021-01-08 16:13:38 +0100 |
| commit | 729cc683735309bdcd55604be19292950877ecf5 (patch) | |
| tree | 1526e51aa0a38f97a5950bc549472aefd58c19c8 /block | |
| parent | scripts/coccinelle: New script to remove unnecessary timer_del() calls (diff) | |
| download | qemu-729cc683735309bdcd55604be19292950877ecf5.tar.gz qemu-729cc683735309bdcd55604be19292950877ecf5.tar.xz qemu-729cc683735309bdcd55604be19292950877ecf5.zip | |
Remove superfluous timer_del() calls
This commit is the result of running the timer-del-timer-free.cocci
script on the whole source tree.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Corey Minyard <cminyard@mvista.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20201215154107.3255-4-peter.maydell@linaro.org
Diffstat (limited to 'block')
| -rw-r--r-- | block/iscsi.c | 2 | ||||
| -rw-r--r-- | block/nbd.c | 1 | ||||
| -rw-r--r-- | block/qcow2.c | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/block/iscsi.c b/block/iscsi.c index 7d4b3b56d5..4d2a416ce7 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1524,12 +1524,10 @@ static void iscsi_detach_aio_context(BlockDriverState *bs) iscsilun->events = 0; if (iscsilun->nop_timer) { - timer_del(iscsilun->nop_timer); timer_free(iscsilun->nop_timer); iscsilun->nop_timer = NULL; } if (iscsilun->event_timer) { - timer_del(iscsilun->event_timer); timer_free(iscsilun->event_timer); iscsilun->event_timer = NULL; } diff --git a/block/nbd.c b/block/nbd.c index 42536702b6..242a258f3a 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -194,7 +194,6 @@ static void nbd_recv_coroutines_wake_all(BDRVNBDState *s) static void reconnect_delay_timer_del(BDRVNBDState *s) { if (s->reconnect_delay_timer) { - timer_del(s->reconnect_delay_timer); timer_free(s->reconnect_delay_timer); s->reconnect_delay_timer = NULL; } diff --git a/block/qcow2.c b/block/qcow2.c index 3a90ef2786..5d94f45be9 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -852,7 +852,6 @@ static void cache_clean_timer_del(BlockDriverState *bs) { BDRVQcow2State *s = bs->opaque; if (s->cache_clean_timer) { - timer_del(s->cache_clean_timer); timer_free(s->cache_clean_timer); s->cache_clean_timer = NULL; } |