diff options
| author | David 'Digit' Turner <digit@google.com> | 2010-03-25 11:11:29 -0700 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2010-03-25 14:19:42 -0700 |
| commit | ce0f4b02160ee72d7d2428867fe757bc37c68c98 (patch) | |
| tree | 13dee7797fad78fbde1fcb2869f7b85e26622e39 /migration-tcp-android.c | |
| parent | ca52b2260ba9f9bac07092c3d8260ed523de1fe1 (diff) | |
| download | external_qemu-ce0f4b02160ee72d7d2428867fe757bc37c68c98.zip external_qemu-ce0f4b02160ee72d7d2428867fe757bc37c68c98.tar.gz external_qemu-ce0f4b02160ee72d7d2428867fe757bc37c68c98.tar.bz2 | |
Fix Win32 socket error handling.
This also fixes -http-proxy support on Windows.
Change-Id: I741b224511c064412ac39351ed4f1b9146a313a5
Diffstat (limited to 'migration-tcp-android.c')
| -rw-r--r-- | migration-tcp-android.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/migration-tcp-android.c b/migration-tcp-android.c index 51e1b78..8287e69 100644 --- a/migration-tcp-android.c +++ b/migration-tcp-android.c @@ -107,11 +107,11 @@ MigrationState *tcp_start_outgoing_migration(const char *host_port, if (ret == -1) ret = -(s->get_error(s)); - if (ret == -EINPROGRESS || ret == -EWOULDBLOCK) + if (ret == -EINPROGRESS || ret == -EWOULDBLOCK || ret == -EAGAIN) qemu_set_fd_handler2(s->fd, NULL, NULL, tcp_wait_for_connect, s); } while (ret == -EINTR); - if (ret < 0 && ret != -EINPROGRESS && ret != -EWOULDBLOCK) { + if (ret < 0 && ret != -EINPROGRESS && ret != -EWOULDBLOCK && ret != -EAGAIN) { dprintf("connect failed\n"); socket_close(s->fd); qemu_free(s); |