From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51480) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKWqo-0002jD-Uj for qemu-devel@nongnu.org; Tue, 26 Mar 2013 12:35:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UKWqm-0004ZY-VE for qemu-devel@nongnu.org; Tue, 26 Mar 2013 12:35:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58867) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKWqm-0004Yb-Lx for qemu-devel@nongnu.org; Tue, 26 Mar 2013 12:35:52 -0400 From: Juan Quintela In-Reply-To: <1364314072-2474-2-git-send-email-stefanha@redhat.com> (Stefan Hajnoczi's message of "Tue, 26 Mar 2013 17:07:49 +0100") References: <1364314072-2474-1-git-send-email-stefanha@redhat.com> <1364314072-2474-2-git-send-email-stefanha@redhat.com> Date: Tue, 26 Mar 2013 17:25:50 +0100 Message-ID: <87ppymku0h.fsf@elfo.elfo> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH 1/4] net: ensure "socket" backend uses non-blocking fds Reply-To: quintela@redhat.com List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi Cc: Anthony Liguori , david.pravec@nethost.cz, mprivozn@redhat.com, Corey Bryant , qemu-devel@nongnu.org Stefan Hajnoczi wrote: > There are several code paths in net_init_socket() depending on how the > socket is created: file descriptor passing, UDP multicast, TCP, or UDP. > Some of these support both listen and connect. > > Not all code paths set the socket to non-blocking. This patch addresses > the file descriptor passing and UDP cases which were missing > socket_set_nonblock(fd) calls. > > I considered moving socket_set_nonblock(fd) to a central location but it > turns out the code paths are different enough to require non-blocking at > different places. > > Signed-off-by: Stefan Hajnoczi > --- > net/socket.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/net/socket.c b/net/socket.c > index 6c3752b..4a88142 100644 > --- a/net/socket.c > +++ b/net/socket.c > @@ -674,6 +674,7 @@ static int net_socket_udp_init(NetClientState *peer, > closesocket(fd); > return -1; > } > + socket_set_nonblock(fd); > > s = net_socket_fd_init(peer, model, name, fd, 0); > if (!s) { > @@ -712,6 +713,7 @@ int net_init_socket(const NetClientOptions *opts, const char *name, > int fd; > > fd = monitor_handle_fd_param(cur_mon, sock->fd); > + socket_set_nonblock(fd); > if (fd == -1 || !net_socket_fd_init(peer, "socket", name, fd, 1)) { Shouldn't be better to refactor the code to _not_ call socket_set_nonblock() in the case that fd == -1? It will just clobber errno? > return -1; > }