On Wed, Jan 02, 2019 at 03:07:24PM +0100, Thomas Huth wrote: > On 2018-12-15 13:03, Li Qiang wrote: > > Assert that the return value is not an error. This is like commit > > 7e6478e7d4f for qemu_set_cloexec. > > > > Signed-off-by: Li Qiang <liq...@163.com> > > --- > > util/oslib-posix.c | 8 ++++++-- > > 1 file changed, 6 insertions(+), 2 deletions(-) > > > > diff --git a/util/oslib-posix.c b/util/oslib-posix.c > > index c1bee2a581..4ce1ba9ca4 100644 > > --- a/util/oslib-posix.c > > +++ b/util/oslib-posix.c > > @@ -233,14 +233,18 @@ void qemu_set_block(int fd) > > { > > int f; > > f = fcntl(fd, F_GETFL); > > - fcntl(fd, F_SETFL, f & ~O_NONBLOCK); > > + assert(f != -1); > > + f = fcntl(fd, F_SETFL, f & ~O_NONBLOCK); > > + assert(f != -1); > > } > > > > void qemu_set_nonblock(int fd) > > { > > int f; > > f = fcntl(fd, F_GETFL); > > - fcntl(fd, F_SETFL, f | O_NONBLOCK); > > + assert(f != -1); > > + f = fcntl(fd, F_SETFL, f | O_NONBLOCK); > > + assert(f != -1); > > } > > Reviewed-by: Thomas Huth <th...@redhat.com> > > Michael, could you take this patch series through your vhost tree? Or > shall I pick them up for the qtests tree? In the latter case, please > provide an ACK for the second patch.
Pls go ahead and merge it. -- MST