From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: [PULL 14/20] tests: Avoid side effects inside g_assert() arguments
Date: Fri, 14 May 2021 14:15:12 +0200 [thread overview]
Message-ID: <20210514121518.832729-15-thuth@redhat.com> (raw)
In-Reply-To: <20210514121518.832729-1-thuth@redhat.com>
From: Peter Maydell <peter.maydell@linaro.org>
For us, assertions are always enabled, but side-effect expressions
inside the argument to g_assert() are bad style anyway. Fix three
occurrences in IPMI related tests, which will silence some Coverity
nits.
Fixes: CID 1432322, CID 1432287, CID 1432291
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210503165525.26221-4-peter.maydell@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qtest/ipmi-bt-test.c | 6 ++++--
tests/qtest/ipmi-kcs-test.c | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/tests/qtest/ipmi-bt-test.c b/tests/qtest/ipmi-bt-test.c
index a42207d416..8492f02a9c 100644
--- a/tests/qtest/ipmi-bt-test.c
+++ b/tests/qtest/ipmi-bt-test.c
@@ -98,7 +98,8 @@ static void bt_wait_b_busy(void)
{
unsigned int count = 1000;
while (IPMI_BT_CTLREG_GET_B_BUSY() != 0) {
- g_assert(--count != 0);
+ --count;
+ g_assert(count != 0);
usleep(100);
}
}
@@ -107,7 +108,8 @@ static void bt_wait_b2h_atn(void)
{
unsigned int count = 1000;
while (IPMI_BT_CTLREG_GET_B2H_ATN() == 0) {
- g_assert(--count != 0);
+ --count;
+ g_assert(count != 0);
usleep(100);
}
}
diff --git a/tests/qtest/ipmi-kcs-test.c b/tests/qtest/ipmi-kcs-test.c
index fc0a918c8d..afc24dd3e4 100644
--- a/tests/qtest/ipmi-kcs-test.c
+++ b/tests/qtest/ipmi-kcs-test.c
@@ -73,7 +73,8 @@ static void kcs_wait_ibf(void)
{
unsigned int count = 1000;
while (IPMI_KCS_CMDREG_GET_IBF() != 0) {
- g_assert(--count != 0);
+ --count;
+ g_assert(count != 0);
}
}
--
2.27.0
next prev parent reply other threads:[~2021-05-14 12:35 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-14 12:14 [PULL 00/20] CI, qtest, and misc patches Thomas Huth
2021-05-14 12:14 ` [PULL 01/20] tests/docker/dockerfiles: Add ccache to containers where it was missing Thomas Huth
2021-05-14 12:15 ` [PULL 02/20] gitlab-ci: Replace YAML anchors by extends (container_job) Thomas Huth
2021-05-14 12:15 ` [PULL 03/20] gitlab-ci: Replace YAML anchors by extends (native_build_job) Thomas Huth
2021-05-14 12:15 ` [PULL 04/20] gitlab-ci: Replace YAML anchors by extends (native_test_job) Thomas Huth
2021-05-14 12:15 ` [PULL 05/20] libqos/qgraph: fix "UNAVAILBLE" typo Thomas Huth
2021-05-14 12:15 ` [PULL 06/20] docs/devel/qgraph: add troubleshooting information Thomas Huth
2021-05-14 12:15 ` [PULL 07/20] libqtest: refuse QTEST_QEMU_BINARY=qemu-kvm Thomas Huth
2021-05-14 12:15 ` [PULL 08/20] util/compatfd.c: Replaced a malloc call with g_malloc Thomas Huth
2021-05-14 12:15 ` [PULL 09/20] tests/qtest/ahci-test.c: Calculate iso_size with 64-bit arithmetic Thomas Huth
2021-05-14 12:15 ` [PULL 10/20] tests/qtest/npcm7xx_pwm-test.c: Avoid g_assert_true() for non-test assertions Thomas Huth
2021-05-14 12:15 ` [PULL 11/20] tests/migration-test: Fix "true" vs true Thomas Huth
2021-05-14 12:15 ` [PULL 12/20] tests/qtest/tpm-util.c: Free memory with correct free function Thomas Huth
2021-05-14 12:15 ` [PULL 13/20] tests/qtest/rtc-test: Remove pointless NULL check Thomas Huth
2021-05-14 12:15 ` Thomas Huth [this message]
2021-05-14 12:15 ` [PULL 15/20] include/sysemu: Poison all accelerator CONFIG switches in common code Thomas Huth
2021-05-14 12:15 ` [PULL 16/20] migration: Move populate_vfio_info() into a separate file Thomas Huth
2021-05-14 12:15 ` [PULL 17/20] configure: Poison all current target-specific #defines Thomas Huth
2021-05-16 20:58 ` Philippe Mathieu-Daudé
2021-05-19 10:43 ` Thomas Huth
2021-05-14 12:15 ` [PULL 18/20] tests/qtest/migration-test: Use g_autofree to avoid leaks on error paths Thomas Huth
2021-05-14 12:15 ` [PULL 19/20] pc-bios/s390-ccw: Fix inline assembly for older versions of Clang Thomas Huth
2021-05-14 12:15 ` [PULL 20/20] cirrus.yml: Fix the MSYS2 task Thomas Huth
2021-05-16 16:19 ` [PULL 00/20] CI, qtest, and misc patches Peter Maydell
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=20210514121518.832729-15-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/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).