From c1d366653207033b811c85da8c839729786451a5 Mon Sep 17 00:00:00 2001 From: aliguori Date: Fri, 24 Oct 2008 21:55:17 +0000 Subject: =?UTF-8?q?Live=20migration=20for=20Win32=20(Herv=C3=A9=20Poussine?= =?UTF-8?q?au)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch fixes migration so that it works on Win32. This requires using socket specific calls since sockets cannot be treated like file descriptors on win32. Signed-off-by: Hervé Poussineau Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5525 c046a42c-6fe2-441c-8c8c-71466251a162 --- migration-tcp.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'migration-tcp.c') diff --git a/migration-tcp.c b/migration-tcp.c index a011a5309..64b64d6b9 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -85,10 +85,10 @@ static ssize_t fd_put_buffer(void *opaque, const void *data, size_t size) do { ret = send(s->fd, data, size, 0); - } while (ret == -1 && errno == EINTR); + } while (ret == -1 && (socket_error() == EINTR || socket_error() == EWOULDBLOCK)); if (ret == -1) - ret = -errno; + ret = -socket_error(); if (ret == -EAGAIN) qemu_set_fd_handler2(s->fd, NULL, NULL, fd_put_notify, s); @@ -123,7 +123,7 @@ static void fd_wait_for_unfreeze(void *opaque) FD_SET(s->fd, &wfds); ret = select(s->fd + 1, NULL, &wfds, NULL, NULL); - } while (ret == -1 && errno == EINTR); + } while (ret == -1 && socket_error() == EINTR); } static void fd_put_ready(void *opaque) @@ -178,7 +178,7 @@ static void tcp_wait_for_connect(void *opaque) dprintf("connect completed\n"); do { ret = getsockopt(s->fd, SOL_SOCKET, SO_ERROR, &val, &valsize); - } while (ret == -1 && errno == EINTR); + } while (ret == -1 && socket_error() == EINTR); if (ret < 0) { tcp_error(s); @@ -273,13 +273,13 @@ MigrationState *tcp_start_outgoing_migration(const char *host_port, do { ret = connect(s->fd, (struct sockaddr *)&addr, sizeof(addr)); if (ret == -1) - ret = -errno; + ret = -socket_error(); - if (ret == -EINPROGRESS) + if (ret == -EINPROGRESS || ret == -EWOULDBLOCK) qemu_set_fd_handler2(s->fd, NULL, NULL, tcp_wait_for_connect, s); } while (ret == -EINTR); - if (ret < 0 && ret != -EINPROGRESS) { + if (ret < 0 && ret != -EINPROGRESS && ret != -EWOULDBLOCK) { dprintf("connect failed\n"); close(s->fd); qemu_free(s); @@ -300,7 +300,7 @@ static void tcp_accept_incoming_migration(void *opaque) do { c = accept(s, (struct sockaddr *)&addr, &addrlen); - } while (c == -1 && errno == EINTR); + } while (c == -1 && socket_error() == EINTR); dprintf("accepted migration\n"); @@ -309,7 +309,7 @@ static void tcp_accept_incoming_migration(void *opaque) return; } - f = qemu_fopen_fd(c); + f = qemu_fopen_socket(c); if (f == NULL) { fprintf(stderr, "could not qemu_fopen socket\n"); goto out; @@ -349,7 +349,7 @@ int tcp_start_incoming_migration(const char *host_port) s = socket(PF_INET, SOCK_STREAM, 0); if (s == -1) - return -errno; + return -socket_error(); val = 1; setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char *)&val, sizeof(val)); @@ -367,5 +367,5 @@ int tcp_start_incoming_migration(const char *host_port) err: close(s); - return -errno; + return -socket_error(); } -- cgit v1.2.3