* [Qemu-devel] [PATCH] s390: avoid always-true comparison in s390_pci_generate_fid()
@ 2016-10-20 12:57 Peter Maydell
2016-10-20 13:26 ` Cornelia Huck
2016-10-26 18:42 ` Michael Tokarev
0 siblings, 2 replies; 3+ messages in thread
From: Peter Maydell @ 2016-10-20 12:57 UTC (permalink / raw)
To: qemu-devel, qemu-trivial
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 <peter.maydell@linaro.org>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] s390: avoid always-true comparison in s390_pci_generate_fid()
2016-10-20 12:57 [Qemu-devel] [PATCH] s390: avoid always-true comparison in s390_pci_generate_fid() Peter Maydell
@ 2016-10-20 13:26 ` Cornelia Huck
2016-10-26 18:42 ` Michael Tokarev
1 sibling, 0 replies; 3+ messages in thread
From: Cornelia Huck @ 2016-10-20 13:26 UTC (permalink / raw)
To: Peter Maydell
Cc: qemu-devel, qemu-trivial, Richard Henderson, Alexander Graf,
Christian Borntraeger
On Thu, 20 Oct 2016 13:57:06 +0100
Peter Maydell <peter.maydell@linaro.org> wrote:
> 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>
> ---
> hw/s390x/s390-pci-bus.c | 10 ++--------
> 1 file changed, 2 insertions(+), 8 deletions(-)
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
I assume this will go via the trivial tree?
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] s390: avoid always-true comparison in s390_pci_generate_fid()
2016-10-20 12:57 [Qemu-devel] [PATCH] s390: avoid always-true comparison in s390_pci_generate_fid() Peter Maydell
2016-10-20 13:26 ` Cornelia Huck
@ 2016-10-26 18:42 ` Michael Tokarev
1 sibling, 0 replies; 3+ messages in thread
From: Michael Tokarev @ 2016-10-26 18:42 UTC (permalink / raw)
To: Peter Maydell, qemu-devel, qemu-trivial
Cc: Cornelia Huck, Christian Borntraeger, Alexander Graf,
Richard Henderson
Applied to -trivial, thanks!
/mjt
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-10-26 18:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-20 12:57 [Qemu-devel] [PATCH] s390: avoid always-true comparison in s390_pci_generate_fid() Peter Maydell
2016-10-20 13:26 ` Cornelia Huck
2016-10-26 18:42 ` Michael Tokarev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).