From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45122) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKWUr-0006dK-5u for qemu-devel@nongnu.org; Tue, 26 Mar 2013 12:13:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UKWUo-0004ev-6V for qemu-devel@nongnu.org; Tue, 26 Mar 2013 12:13:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44829) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKWUn-0004ep-Un for qemu-devel@nongnu.org; Tue, 26 Mar 2013 12:13:10 -0400 From: Stefan Hajnoczi Date: Tue, 26 Mar 2013 17:07:49 +0100 Message-Id: <1364314072-2474-2-git-send-email-stefanha@redhat.com> In-Reply-To: <1364314072-2474-1-git-send-email-stefanha@redhat.com> References: <1364314072-2474-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 1/4] net: ensure "socket" backend uses non-blocking fds List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Juan Quintela , mprivozn@redhat.com, Corey Bryant , david.pravec@nethost.cz, Stefan Hajnoczi 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)) { return -1; } -- 1.8.1.4