diff options
| author | Peter Maydell | 2016-10-20 14:57:06 +0200 |
|---|---|---|
| committer | Michael Tokarev | 2016-10-28 17:17:23 +0200 |
| commit | 35b6e94ba50cd92600a85eef444bc31df8999de1 (patch) | |
| tree | 271f3dcb3320d30eadafba117a5468e75a407bbb /hw/s390x | |
| parent | migration: Remove unneeded NULL check from migrate_fd_error() (diff) | |
| download | qemu-35b6e94ba50cd92600a85eef444bc31df8999de1.tar.gz qemu-35b6e94ba50cd92600a85eef444bc31df8999de1.tar.xz qemu-35b6e94ba50cd92600a85eef444bc31df8999de1.zip | |
s390: avoid always-true comparison in s390_pci_generate_fid()
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 <peter.maydell@linaro.org>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to 'hw/s390x')
| -rw-r--r-- | hw/s390x/s390-pci-bus.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index b7f8bca1fd..bbbe0b1245 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; |