From patchwork Tue Mar 26 16:07:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 231427 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BC6F92C0084 for ; Wed, 27 Mar 2013 03:13:38 +1100 (EST) Received: from localhost ([::1]:41303 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKWVC-0006lf-QU for incoming@patchwork.ozlabs.org; Tue, 26 Mar 2013 12:13:34 -0400 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 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2QG80vn021983 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 26 Mar 2013 12:08:00 -0400 Received: from localhost (ovpn-112-22.ams2.redhat.com [10.36.112.22]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r2QG7x8O023466; Tue, 26 Mar 2013 12:08:00 -0400 From: Stefan Hajnoczi To: 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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Anthony Liguori , Juan Quintela , mprivozn@redhat.com, Corey Bryant , david.pravec@nethost.cz, Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 1/4] net: ensure "socket" backend uses non-blocking fds X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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; }