From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51884) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bxCuL-0002Ss-Bz for qemu-devel@nongnu.org; Thu, 20 Oct 2016 08:57:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bxCuK-0004JL-NQ for qemu-devel@nongnu.org; Thu, 20 Oct 2016 08:57:17 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:47379) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1bxCuK-0004DT-DY for qemu-devel@nongnu.org; Thu, 20 Oct 2016 08:57:16 -0400 From: Peter Maydell Date: Thu, 20 Oct 2016 13:57:06 +0100 Message-Id: <1476968226-15918-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH] s390: avoid always-true comparison in s390_pci_generate_fid() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, qemu-trivial@nongnu.org Cc: Richard Henderson , Alexander Graf , Cornelia Huck , Christian Borntraeger 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 --- 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.7.4