From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=48898 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1P8xqm-0003fD-QY
	for qemu-devel@nongnu.org; Thu, 21 Oct 2010 12:18:45 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gianni.tedesco@citrix.com>) id 1P8xql-0002vo-JV
	for qemu-devel@nongnu.org; Thu, 21 Oct 2010 12:18:44 -0400
Received: from smtp02.citrix.com ([66.165.176.63]:18800)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gianni.tedesco@citrix.com>) id 1P8xql-0002vU-GR
	for qemu-devel@nongnu.org; Thu, 21 Oct 2010 12:18:43 -0400
From: Gianni Tedesco <gianni.tedesco@citrix.com>
Content-Type: text/plain; charset="UTF-8"
Date: Thu, 21 Oct 2010 17:18:39 +0100
Message-ID: <1287677919.12843.4383.camel@qabil.uk.xensource.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] [PATCH]: VNC: set listener socket to non-blocking mode
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: "qemu-devel@nongnu.org" <qemu-devel@nongnu.org>

This prevents qemu from hanging waiting for a client to connect. I have
reproduced this when doing a loadvm but it may be a more general problem
in that poll/accept may race if a client aborts the connection with a
RST before the accept has completed. In either case the fix seems
harmless.

Signed-off-by: Gianni Tedesco <gianni.tedesco@citrix.com>

diff --git a/ui/vnc.c b/ui/vnc.c
index 864342e..172b988 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -2736,5 +2736,6 @@ int vnc_display_open(DisplayState *ds, const char *display)
             vs->display = dpy;
         }
     }
+    socket_set_nonblock(vs->lsock);
     return qemu_set_fd_handler2(vs->lsock, NULL, vnc_listen_read, NULL, vs);
 }