[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 17/23] s390: avoid always-true comparison in s390_p
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 17/23] s390: avoid always-true comparison in s390_pci_generate_fid() |
Date: |
Fri, 28 Oct 2016 18:18:48 +0300 |
From: Peter Maydell <address@hidden>
Coverity points out that the comparison "fid <= ZPCI_MAX_FID"
in s390_pci_generate_fid() is always true (because fid
is 32 bits and ZPCI_MAX_FID is 0xffffffff). This isn't a
bug because the real loop termination condition is
expressed later via an "if (...) break;" inside the loop,
but it is a bit odd. Rephrase the loop to avoid the
unnecessary duplicate-but-never-true conditional.
Signed-off-by: Peter Maydell <address@hidden>
Acked-by: Cornelia Huck <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/s390x/s390-pci-bus.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index b7f8bca..bbbe0b1 100644
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -809,17 +809,11 @@ static uint32_t s390_pci_generate_fid(Error **errp)
{
uint32_t fid = 0;
- while (fid <= ZPCI_MAX_FID) {
+ do {
if (!s390_pci_find_dev_by_fid(fid)) {
return fid;
}
-
- if (fid == ZPCI_MAX_FID) {
- break;
- }
-
- fid++;
- }
+ } while (fid++ != ZPCI_MAX_FID);
error_setg(errp, "no free fid could be found");
return 0;
--
2.1.4
- [Qemu-trivial] [PULL 00/23] Trivial patches for 2016-10-28, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 07/23] lm32: milkymist-tmu2: fix integer overflow, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 01/23] filter-dump: add missing "[", Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 08/23] target-lm32: rewrite gen_compare(), Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 02/23] hw/tpm/tpm_passthrough: Simplify if-statements a little bit, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 05/23] target-lm32: swap operand of wcsr in LOG_DIS(), Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 19/23] qemu-ga: Remove stray 'q' in documentation, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 11/23] colo-compare: remove unused struct CompareChardevProps and 'props' variable, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 13/23] usb: Change *_exitfn return type from int to void, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 06/23] target-lm32: disable asm logging via LOG_DIS(), Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 17/23] s390: avoid always-true comparison in s390_pci_generate_fid(),
Michael Tokarev <=
- [Qemu-trivial] [PULL 04/23] target-lm32: fix LOG_DIS operand order, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 23/23] Fix build for less common build directories names, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 20/23] monitor: deprecate 'default' option, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 03/23] target-lm32: fix style issue, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 15/23] scripts/hxtool: fix undefined behavour of echo, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 18/23] Makefile: Fix help text for target 'installer', Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 14/23] qemu-options.hx: set: fix copy-paste error, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 16/23] migration: Remove unneeded NULL check from migrate_fd_error(), Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 21/23] scripts/clean-includes: added duplicate #include check, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 10/23] milkymist-pfpu: fix potential integer overflow, Michael Tokarev, 2016/10/28