From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Cc: Laurent Vivier <lvivier@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Thomas Huth <thuth@redhat.com>, Corey Minyard <minyard@acm.org>,
Stefan Berger <stefanb@linux.vnet.ibm.com>
Subject: [PATCH 2/3] tests/qtest/rtc-test: Remove pointless NULL check
Date: Mon, 3 May 2021 17:55:24 +0100 [thread overview]
Message-ID: <20210503165525.26221-3-peter.maydell@linaro.org> (raw)
In-Reply-To: <20210503165525.26221-1-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>
---
tests/qtest/rtc-test.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/tests/qtest/rtc-test.c b/tests/qtest/rtc-test.c
index 402ce2c6090..8126ab1bdb8 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;
}
--
2.20.1
next prev parent reply other threads:[~2021-05-03 17:07 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-03 16:55 [PATCH 0/3] tests: three easy Coverity fixes Peter Maydell
2021-05-03 16:55 ` [PATCH 1/3] tests/qtest/tpm-util.c: Free memory with correct free function Peter Maydell
2021-05-03 16:59 ` Stefan Berger
2021-05-04 8:44 ` Alex Bennée
2021-05-03 16:55 ` Peter Maydell [this message]
2021-05-04 5:43 ` [PATCH 2/3] tests/qtest/rtc-test: Remove pointless NULL check Thomas Huth
2021-05-04 8:47 ` Alex Bennée
2021-05-03 16:55 ` [PATCH 3/3] tests: Avoid side effects inside g_assert() arguments Peter Maydell
2021-05-03 17:14 ` Philippe Mathieu-Daudé
2021-05-04 7:18 ` Thomas Huth
2021-05-04 8:46 ` Peter Maydell
2021-05-04 8:48 ` Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210503165525.26221-3-peter.maydell@linaro.org \
--to=peter.maydell@linaro.org \
--cc=lvivier@redhat.com \
--cc=minyard@acm.org \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanb@linux.vnet.ibm.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).