diff options
| author | Orit Wasserman <owasserm@redhat.com> | 2012-09-24 13:11:08 +0200 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2012-10-11 21:44:21 -0500 |
| commit | ee0999b16af3cfd874a1bd9a0cfe3f60426878cf (patch) | |
| tree | 144e5a6c0fe26fb01c200bf413487416ffb895ae /migration-tcp.c | |
| parent | 57f8a4c507be7b850756496e224e1dd3e9efc70e (diff) | |
Separate inet_connect into inet_connect (blocking) and inet_nonblocking_connect
No need to add non blocking parameters to the blocking inet_connect
add block parameter for inet_connect_opts instead of using QemuOpt "block".
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit 5db5f44cb4b7f24b9e0efdefc9015e36b7c34881)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'migration-tcp.c')
| -rw-r--r-- | migration-tcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/migration-tcp.c b/migration-tcp.c index ac891c38a3..7f6ad98727 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -88,7 +88,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, &in_progress, errp); + s->fd = inet_nonblocking_connect(host_port, &in_progress, errp); if (error_is_set(errp)) { migrate_fd_error(s); return -1; |