From: Stefan Hajnoczi <stefanha@redhat.com>
Date: Thu, 4 Apr 2013 14:18:30 +0000 (+0200)
Subject: qemu-socket: set passed fd non-blocking in socket_connect()
X-Git-Tag: v1.4.1~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=283b7de6a57ff96db89d46874cfdb6fc590760dc;p=thirdparty%2Fqemu.git

qemu-socket: set passed fd non-blocking in socket_connect()

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 <stefanha@redhat.com>
(cherry picked from commit 35fb94fa292173a3e1df0768433e06912a2a88e4)

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index e92e0d568aa..cd54fb4af77 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;