From patchwork Thu Oct 21 16:18:39 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: : VNC: set listener socket to non-blocking mode
Date: Thu, 21 Oct 2010 06:18:39 -0000
From: Gianni Tedesco <gianni.tedesco@citrix.com>
X-Patchwork-Id: 68726
Message-Id: <1287677919.12843.4383.camel@qabil.uk.xensource.com>
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);
 }