summaryrefslogtreecommitdiff
path: root/migration-tcp.c
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 /migration-tcp.c
parenteef5ad1086403d8ac8d91208a0e8dc34734b671c (diff)
downloadqemu-02a08fef079469c005d48fe2d181f0e0eb5752ae.tar.gz
qemu-02a08fef079469c005d48fe2d181f0e0eb5752ae.tar.bz2
qemu-02a08fef079469c005d48fe2d181f0e0eb5752ae.zip
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 'migration-tcp.c')
-rw-r--r--migration-tcp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/migration-tcp.c b/migration-tcp.c
index 440804db75..18944a41a3 100644
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -86,7 +86,7 @@ int tcp_start_outgoing_migration(MigrationState *s, const char *host_port,
s->write = socket_write;
s->close = tcp_close;
- s->fd = inet_connect(host_port, false, errp);
+ s->fd = inet_connect(host_port, false, NULL, errp);
if (!error_is_set(errp)) {
migrate_fd_connect(s);