aboutsummaryrefslogtreecommitdiff
path: root/net
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 /net
parent01b3e68bb18d1a37f013ffac41423faa7c00958f (diff)
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 'net')
-rw-r--r--net/announce.c1
-rw-r--r--net/colo-compare.c1
-rw-r--r--net/slirp.c1
3 files changed, 0 insertions, 3 deletions
diff --git a/net/announce.c b/net/announce.c
index db90d3bd4b..26f057f5ee 100644
--- a/net/announce.c
+++ b/net/announce.c
@@ -41,7 +41,6 @@ void qemu_announce_timer_del(AnnounceTimer *timer, bool free_named)
{
bool free_timer = false;
if (timer->tm) {
- timer_del(timer->tm);
timer_free(timer->tm);
timer->tm = NULL;
}
diff --git a/net/colo-compare.c b/net/colo-compare.c
index 337025b44f..84db4978ac 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -951,7 +951,6 @@ static void colo_compare_timer_init(CompareState *s)
static void colo_compare_timer_del(CompareState *s)
{
if (s->packet_check_timer) {
- timer_del(s->packet_check_timer);
timer_free(s->packet_check_timer);
s->packet_check_timer = NULL;
}
diff --git a/net/slirp.c b/net/slirp.c
index 77042e6df7..8350c6d45f 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -184,7 +184,6 @@ static void *net_slirp_timer_new(SlirpTimerCb cb,
static void net_slirp_timer_free(void *timer, void *opaque)
{
- timer_del(timer);
timer_free(timer);
}