| Message ID | 20200731070604.0c981f41@luklap (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | colo-compare: Remove superfluous NULL-pointer checks for s->iothread | expand |
On 7/31/20 7:06 AM, Lukas Straub wrote: > 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> > --- > net/colo-compare.c | 8 ++------ > 1 file 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); >
Lukas Straub <lukasstraub2@web.de> 于2020年7月31日周五 下午1:09写道： > > 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: Li Qiang <liq3ea@gmail.com> > --- > net/colo-compare.c | 8 ++------ > 1 file 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); > -- > 2.20.1
> -----Original Message----- > From: Lukas Straub <lukasstraub2@web.de> > Sent: Friday, July 31, 2020 1:06 PM > To: qemu-devel <qemu-devel@nongnu.org> > Cc: Peter Maydell <peter.maydell@linaro.org>; Jason Wang > <jasowang@redhat.com>; Zhang, Chen <chen.zhang@intel.com> > Subject: [PATCH] colo-compare: Remove superfluous NULL-pointer checks > for s->iothread > > s->iothread is checked for NULL on object creation in > s->colo_compare_complete, > so it's guaranteed not to be NULL. > This resolves a false alert from Coverity (CID 1429969). > Reviewed-by: Zhang Chen <chen.zhang@intel.com> > Signed-off-by: Lukas Straub <lukasstraub2@web.de> > --- > net/colo-compare.c | 8 ++------ > 1 file 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); > -- > 2.20.1
On 2020/7/31 下午1:06, Lukas Straub wrote: > 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> > --- > net/colo-compare.c | 8 ++------ > 1 file 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); Applied. Thanks
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);
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> --- net/colo-compare.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)