From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gehwL-0004Os-8x for qemu-devel@nongnu.org; Wed, 02 Jan 2019 09:56:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gehw6-0004MB-IW for qemu-devel@nongnu.org; Wed, 02 Jan 2019 09:56:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:17090) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gehw6-0004LL-6a for qemu-devel@nongnu.org; Wed, 02 Jan 2019 09:55:58 -0500 Date: Wed, 2 Jan 2019 09:55:41 -0500 From: "Michael S. Tsirkin" Message-ID: <20190102095527-mutt-send-email-mst@kernel.org> References: <20181215120353.82786-1-liq3ea@163.com> <20181215120353.82786-4-liq3ea@163.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: Re: [Qemu-devel] [PATCH v2 3/3] util: check the return value of fcntl in qemu_set_{block, nonblock} List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Thomas Huth Cc: Li Qiang , lvivier@redhat.com, pbonzini@redhat.com, peter.maydell@linaro.org, marcandre.lureau@redhat.com, berrange@redhat.com, jasowang@redhat.com, liq3ea@gmail.com, qemu-devel@nongnu.org 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 > > --- > > 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 > > 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