[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 14/20] tests: Avoid side effects inside g_assert() arguments
From: |
Thomas Huth |
Subject: |
[PULL 14/20] tests: Avoid side effects inside g_assert() arguments |
Date: |
Fri, 14 May 2021 14:15:12 +0200 |
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
- [PULL 07/20] libqtest: refuse QTEST_QEMU_BINARY=qemu-kvm, (continued)
- [PULL 07/20] libqtest: refuse QTEST_QEMU_BINARY=qemu-kvm, Thomas Huth, 2021/05/14
- [PULL 06/20] docs/devel/qgraph: add troubleshooting information, Thomas Huth, 2021/05/14
- [PULL 10/20] tests/qtest/npcm7xx_pwm-test.c: Avoid g_assert_true() for non-test assertions, Thomas Huth, 2021/05/14
- [PULL 11/20] tests/migration-test: Fix "true" vs true, Thomas Huth, 2021/05/14
- [PULL 09/20] tests/qtest/ahci-test.c: Calculate iso_size with 64-bit arithmetic, Thomas Huth, 2021/05/14
- [PULL 08/20] util/compatfd.c: Replaced a malloc call with g_malloc., Thomas Huth, 2021/05/14
- [PULL 13/20] tests/qtest/rtc-test: Remove pointless NULL check, Thomas Huth, 2021/05/14
- [PULL 17/20] configure: Poison all current target-specific #defines, Thomas Huth, 2021/05/14
- [PULL 14/20] tests: Avoid side effects inside g_assert() arguments,
Thomas Huth <=
- [PULL 15/20] include/sysemu: Poison all accelerator CONFIG switches in common code, Thomas Huth, 2021/05/14
- [PULL 16/20] migration: Move populate_vfio_info() into a separate file, Thomas Huth, 2021/05/14
- [PULL 12/20] tests/qtest/tpm-util.c: Free memory with correct free function, Thomas Huth, 2021/05/14
- [PULL 19/20] pc-bios/s390-ccw: Fix inline assembly for older versions of Clang, Thomas Huth, 2021/05/14
- [PULL 18/20] tests/qtest/migration-test: Use g_autofree to avoid leaks on error paths, Thomas Huth, 2021/05/14
- [PULL 20/20] cirrus.yml: Fix the MSYS2 task, Thomas Huth, 2021/05/14
- Re: [PULL 00/20] CI, qtest, and misc patches, Peter Maydell, 2021/05/16