aboutsummaryrefslogtreecommitdiff
path: root/hw/char
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-12-15 15:41:06 +0000
committerPeter Maydell <peter.maydell@linaro.org>2021-01-08 15:13:38 +0000
commit729cc683735309bdcd55604be19292950877ecf5 (patch)
tree1526e51aa0a38f97a5950bc549472aefd58c19c8 /hw/char
parent01b3e68bb18d1a37f013ffac41423faa7c00958f (diff)
downloadqemu-729cc683735309bdcd55604be19292950877ecf5.zip
qemu-729cc683735309bdcd55604be19292950877ecf5.tar.gz
qemu-729cc683735309bdcd55604be19292950877ecf5.tar.bz2
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 'hw/char')
-rw-r--r--hw/char/serial.c2
-rw-r--r--hw/char/virtio-serial-bus.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/hw/char/serial.c b/hw/char/serial.c
index 6e52539..bc2e322 100644
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -941,10 +941,8 @@ static void serial_unrealize(DeviceState *dev)
qemu_chr_fe_deinit(&s->chr, false);
- timer_del(s->modem_status_poll);
timer_free(s->modem_status_poll);
- timer_del(s->fifo_timeout_timer);
timer_free(s->fifo_timeout_timer);
fifo8_destroy(&s->recv_fifo);
diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
index cf08ef9..b200389 100644
--- a/hw/char/virtio-serial-bus.c
+++ b/hw/char/virtio-serial-bus.c
@@ -741,7 +741,6 @@ static void virtio_serial_post_load_timer_cb(void *opaque)
}
}
g_free(s->post_load->connected);
- timer_del(s->post_load->timer);
timer_free(s->post_load->timer);
g_free(s->post_load);
s->post_load = NULL;
@@ -1138,7 +1137,6 @@ static void virtio_serial_device_unrealize(DeviceState *dev)
g_free(vser->ports_map);
if (vser->post_load) {
g_free(vser->post_load->connected);
- timer_del(vser->post_load->timer);
timer_free(vser->post_load->timer);
g_free(vser->post_load);
}