From patchwork Wed Mar 27 18:46:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 231788 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 1F9F82C00D5 for ; Thu, 28 Mar 2013 05:47:20 +1100 (EST) Received: from localhost ([::1]:50103 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKvNU-00071q-AR for incoming@patchwork.ozlabs.org; Wed, 27 Mar 2013 14:47:16 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51609) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKvMu-0006wl-N2 for qemu-devel@nongnu.org; Wed, 27 Mar 2013 14:46:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UKvMs-0004Qt-TK for qemu-devel@nongnu.org; Wed, 27 Mar 2013 14:46:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62859) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKvMs-0004Qk-LJ for qemu-devel@nongnu.org; Wed, 27 Mar 2013 14:46:38 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2RIkbqh004023 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 27 Mar 2013 14:46:37 -0400 Received: from localhost (ovpn-113-92.phx2.redhat.com [10.3.113.92]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r2RIkbrY012341; Wed, 27 Mar 2013 14:46:37 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 27 Mar 2013 14:46:24 -0400 Message-Id: <1364409987-23742-4-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1364409987-23742-1-git-send-email-lcapitulino@redhat.com> References: <1364409987-23742-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [PULL 3/6] qemu-socket: set passed fd non-blocking in socket_connect() 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 From: Stefan Hajnoczi 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 Reviewed-by: Eric Blake Signed-off-by: Luiz Capitulino --- util/qemu-sockets.c | 1 + 1 file changed, 1 insertion(+) diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index b632a74..94581aa 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -910,6 +910,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;