Skip to content

Commit

Permalink
s390: avoid always-true comparison in s390_pci_generate_fid()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
pm215 authored and Michael Tokarev committed Oct 28, 2016
1 parent 2517405 commit 35b6e94
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions hw/s390x/s390-pci-bus.c
Expand Up @@ -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;
Expand Down

0 comments on commit 35b6e94

Please sign in to comment.