aboutsummaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
authorLuiz Capitulino <lcapitulino@redhat.com>2012-08-01 13:42:47 -0300
committerLuiz Capitulino <lcapitulino@redhat.com>2012-08-13 13:20:34 -0300
commit02a08fef079469c005d48fe2d181f0e0eb5752ae (patch)
tree9de321a2b23b4a7509052a8c5c45f945db09acbf /ui
parenteef5ad1086403d8ac8d91208a0e8dc34734b671c (diff)
downloadqemu-02a08fef079469c005d48fe2d181f0e0eb5752ae.zip
qemu-02a08fef079469c005d48fe2d181f0e0eb5752ae.tar.gz
qemu-02a08fef079469c005d48fe2d181f0e0eb5752ae.tar.bz2
net: inet_connect(), inet_connect_opts(): add in_progress argument
It's used to indicate the special case where a valid file-descriptor is returned (ie. success) but the connection can't be completed w/o blocking. This is needed because QERR_SOCKET_CONNECT_IN_PROGRESS is not treated like an error and a future commit will drop it. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'ui')
-rw-r--r--ui/vnc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/vnc.c b/ui/vnc.c
index 312ad7f..385e345 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3061,7 +3061,7 @@ int vnc_display_open(DisplayState *ds, const char *display)
if (strncmp(display, "unix:", 5) == 0)
vs->lsock = unix_connect(display+5);
else
- vs->lsock = inet_connect(display, true, NULL);
+ vs->lsock = inet_connect(display, true, NULL, NULL);
if (-1 == vs->lsock) {
g_free(vs->display);
vs->display = NULL;