From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45285) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNl09-0000O5-5N for qemu-devel@nongnu.org; Thu, 04 Apr 2013 10:18:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNl02-0006G0-0L for qemu-devel@nongnu.org; Thu, 04 Apr 2013 10:18:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52831) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNl01-0006Fc-P2 for qemu-devel@nongnu.org; Thu, 04 Apr 2013 10:18:45 -0400 From: Stefan Hajnoczi Date: Thu, 4 Apr 2013 16:18:30 +0200 Message-Id: <1365085111-17027-4-git-send-email-stefanha@redhat.com> In-Reply-To: <1365085111-17027-1-git-send-email-stefanha@redhat.com> References: <1365085111-17027-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH stable-1.4 v2 3/4] qemu-socket: set passed fd non-blocking in socket_connect() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Markus Armbruster , Michael Roth , Stefan Hajnoczi , Luiz Capitulino socket_connect() sets non-blocking on TCP or UNIX domain sockets if a callback function is passed. Do the same for file descriptor passing, otherwise we could unexpectedly be using a blocking file descriptor. Signed-off-by: Stefan Hajnoczi (cherry picked from commit 35fb94fa292173a3e1df0768433e06912a2a88e4) Signed-off-by: Stefan Hajnoczi --- util/qemu-sockets.c | 1 + 1 file changed, 1 insertion(+) diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index e92e0d5..cd54fb4 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -906,6 +906,7 @@ int socket_connect(SocketAddress *addr, Error **errp, case SOCKET_ADDRESS_KIND_FD: fd = monitor_get_fd(cur_mon, addr->fd->str, errp); if (callback) { + qemu_set_nonblock(fd); callback(fd, opaque); } break; -- 1.8.1.4