summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLukas Straub <lukasstraub2@web.de>2020-07-31 07:06:04 +0200
committerJason Wang <jasowang@redhat.com>2020-08-04 14:14:48 +0800
commitf81cddfe8abe7d7e2220e611ee69d2cdf34eb789 (patch)
tree96b1e7cfbe2289f4a623fda0a79702ba3008df93
parent5c1c3e4f02e458cf280c677c817ae4fd1ed9bf10 (diff)
downloadfocaccia-qemu-f81cddfe8abe7d7e2220e611ee69d2cdf34eb789.tar.gz
focaccia-qemu-f81cddfe8abe7d7e2220e611ee69d2cdf34eb789.zip
colo-compare: Remove superfluous NULL-pointer checks for s->iothread
s->iothread is checked for NULL on object creation in colo_compare_complete,
so it's guaranteed not to be NULL.
This resolves a false alert from Coverity (CID 1429969).

Signed-off-by: Lukas Straub <lukasstraub2@web.de>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Reviewed-by: Zhang Chen <chen.zhang@intel.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
-rw-r--r--net/colo-compare.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/net/colo-compare.c b/net/colo-compare.c
index cc15f23dea..2c20de1537 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -1442,9 +1442,7 @@ static void colo_compare_finalize(Object *obj)
         qemu_chr_fe_deinit(&s->chr_notify_dev, false);
     }
 
-    if (s->iothread) {
-        colo_compare_timer_del(s);
-    }
+    colo_compare_timer_del(s);
 
     qemu_bh_delete(s->event_bh);
 
@@ -1470,9 +1468,7 @@ static void colo_compare_finalize(Object *obj)
         g_hash_table_destroy(s->connection_track_table);
     }
 
-    if (s->iothread) {
-        object_unref(OBJECT(s->iothread));
-    }
+    object_unref(OBJECT(s->iothread));
 
     g_free(s->pri_indev);
     g_free(s->sec_indev);