slirp: Gcc 9 -O3 fix
PATCH v2 1/1 slirp: Gcc 9 -O3 fix
From: "Dr. David Alan Gilbert" <[email protected]>
Gcc 9 needs some convincing that sopreprbuf really is going to fill in iov in the call from soreadbuf, even though the failure case shouldn't happen.
--- slirp/src/socket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
slirp/src/socket.c +2 -1
@@ -181,7 +181,7 @@ soread(struct socket *so)* No need to check if there's enough room to read. * soread wouldn't have been called if there weren't */ -sopreprbuf (so, iov, &n); +assert (sopreprbuf (so, iov, &n) !=0 ); nn =recv (so->s, iov[0 ].iov_base, iov[0 ].iov_len,0 );if (nn <=0 ) {
@@ -257,6 +257,7 @@ int soreadbuf(struct socket *so, const char *buf, int size)* No need to check if there's enough room to read. * soread wouldn't have been called if there weren't */ +assert (size >0 );if (sopreprbuf (so, iov, &n) < size) goto err;
Signature · 1 line
2.21.0
Dr. David Alan Gilbert (git), le lun. 15 avril 2019 13:02:05 +0100, a ecrit:
Quoted 16 lines
From: "Dr. David Alan Gilbert" <[email protected]>
Gcc 9 needs some convincing that sopreprbuf really is going to fill in iov in the call from soreadbuf, even though the failure case shouldn't happen.
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- slirp/src/socket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)slirp/src/socket.c +0
-0
slirp/src/socket.c soread(struct socket *so) · line 184
Quoted 5 lines
slirp/src/socket.c +1
-1@@ -181,7 +181,7 @@ soread(struct socket *so)* No need to check if there's enough room to read. * soread wouldn't have been called if there weren't */ -sopreprbuf (so, iov, &n); +assert (sopreprbuf (so, iov, &n) !=0 );
Please make this through a variable, otherwise anybody building with -DNDEBUG will get sopreprbuf not being called.
Quoted 13 lines
slirp/src/socket.c +1
-0nn =recv (so->s, iov[0 ].iov_base, iov[0 ].iov_len,0 );if (nn <=0 ) {@@ -257,6 +257,7 @@ int soreadbuf(struct socket *so, const char *buf, int size)* No need to check if there's enough room to read. * soread wouldn't have been called if there weren't */ +assert (size >0 );if (sopreprbuf (so, iov, &n) < size) goto err;Signature · 1 line
2.21.0
Quoted 12 lines · * Samuel Thibault ([email protected]) wrote:
Dr. David Alan Gilbert (git), le lun. 15 avril 2019 13:02:05 +0100, a ecrit:
Quoted 11 lines
From: "Dr. David Alan Gilbert" <[email protected]>
Gcc 9 needs some convincing that sopreprbuf really is going to fill in iov in the call from soreadbuf, even though the failure case shouldn't happen.
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- slirp/src/socket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Quoted 13 lines
slirp/src/socket.c soread(struct socket *so) · line 184
Quoted 10 lines
slirp/src/socket.c +1
-1@@ -181,7 +181,7 @@ soread(struct socket *so)* No need to check if there's enough room to read. * soread wouldn't have been called if there weren't */ -sopreprbuf (so, iov, &n); +assert (sopreprbuf (so, iov, &n) !=0 );Please make this through a variable, otherwise anybody building with -DNDEBUG will get sopreprbuf not being called.
Coming up.
Dave
Quoted 10 lines
Quoted 10 lines
slirp/src/socket.c +1
-0nn =recv (so->s, iov[0 ].iov_base, iov[0 ].iov_len,0 );if (nn <=0 ) {@@ -257,6 +257,7 @@ int soreadbuf(struct socket *so, const char *buf, int size)* No need to check if there's enough room to read. * soread wouldn't have been called if there weren't */ +assert (size >0 );if (sopreprbuf (so, iov, &n) < size) goto err;
Quoted 3 lines
Quoted 3 lines
Signature · 1 line
2.21.0
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Message-id: [email protected]
Subject: [Qemu-devel] [PATCH v2] slirp: Gcc 9 -O3 fix
Type: series
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
* [new tag] patchew/[email protected] -> patchew/[email protected]
Switched to a new branch 'test'81e4d9dd83 slirp: Gcc 9 -O3 fix
=== OUTPUT BEGIN ===
ERROR: code indent should never use tabs
#23: FILE: slirp/src/socket.c:184:
+^Iassert(sopreprbuf(so, iov, &n) != 0);$
ERROR: code indent should never use tabs
#31: FILE: slirp/src/socket.c:260:
+^Iassert(size > 0);$
total: 2 errors, 0 warnings, 15 lines checked
Commit 81e4d9dd83e0 (slirp: Gcc 9 -O3 fix) has style problems, please review. If any of these errors are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]