diff mbox series

[PULL,13/20] tests/qtest/rtc-test: Remove pointless NULL check

Message ID 20210514121518.832729-14-thuth@redhat.com (mailing list archive)
State New, archived
Headers show
Series [PULL,01/20] tests/docker/dockerfiles: Add ccache to containers where it was missing | expand

Commit Message

Thomas Huth May 14, 2021, 12:15 p.m. UTC
From: Peter Maydell <peter.maydell@linaro.org>

In rtc-test.c we know that s is non-NULL because qtest_start()
will return a non-NULL value, and we assume this when we
pass s to qtest_irq_intercept_in(). So we can drop the
initial assignment of NULL and the "if (s)" condition at
the end of the function.

Fixes: Coverity CID 1432353
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210503165525.26221-3-peter.maydell@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
 tests/qtest/rtc-test.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
diff mbox series


diff --git a/tests/qtest/rtc-test.c b/tests/qtest/rtc-test.c
index 402ce2c609..8126ab1bdb 100644
--- a/tests/qtest/rtc-test.c
+++ b/tests/qtest/rtc-test.c
@@ -686,7 +686,7 @@  static void periodic_timer(void)
 int main(int argc, char **argv)
-    QTestState *s = NULL;
+    QTestState *s;
     int ret;
     g_test_init(&argc, &argv, NULL);
@@ -712,9 +712,7 @@  int main(int argc, char **argv)
     ret = g_test_run();
-    if (s) {
-        qtest_quit(s);
-    }
+    qtest_quit(s);
     return ret;