motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-31 06:13:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

migration: propagate error correctly

Browse source 
unix and tcp outgoing migration have error values, but didn't returned
it.  Make them return the error.  Notice that EINPROGRESS & EWOULDBLOCK
are not considered errors as call will be retry later.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Juan Quintela 2011-02-23 19:56:52 +01:00
parent efab4718f4
commit 8414ff3bd8
2 changed files with 21 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

18
migration-tcp.c
View file

@ -90,26 +90,28 @@ int tcp_start_outgoing_migration(MigrationState *s, const char *host_port)
s->fd = qemu_socket(PF_INET, SOCK_STREAM, 0); s->fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
if (s->fd == -1) { if (s->fd == -1) {
return -1; return -socket_error();
} }
socket_set_nonblock(s->fd); socket_set_nonblock(s->fd);
do { do {
ret = connect(s->fd, (struct sockaddr *)&addr, sizeof(addr)); ret = connect(s->fd, (struct sockaddr *)&addr, sizeof(addr));
if (ret == -1) if (ret == -1) {
ret = -(socket_error()); ret = -socket_error();
}
if (ret == -EINPROGRESS || ret == -EWOULDBLOCK) if (ret == -EINPROGRESS || ret == -EWOULDBLOCK) {
qemu_set_fd_handler2(s->fd, NULL, NULL, tcp_wait_for_connect, s); qemu_set_fd_handler2(s->fd, NULL, NULL, tcp_wait_for_connect, s);
return 0;
}
} while (ret == -EINTR); } while (ret == -EINTR);
if (ret < 0 && ret != -EINPROGRESS && ret != -EWOULDBLOCK) { if (ret < 0) {
DPRINTF("connect failed\n"); DPRINTF("connect failed\n");
migrate_fd_error(s); migrate_fd_error(s);
} else if (ret >= 0) return ret;
}
migrate_fd_connect(s); migrate_fd_connect(s);
return 0; return 0;
} }

24
migration-unix.c
View file

@ -88,35 +88,29 @@ int unix_start_outgoing_migration(MigrationState *s, const char *path)
s->fd = qemu_socket(PF_UNIX, SOCK_STREAM, 0); s->fd = qemu_socket(PF_UNIX, SOCK_STREAM, 0);
if (s->fd < 0) { if (s->fd < 0) {
DPRINTF("Unable to open socket"); DPRINTF("Unable to open socket");
goto err_after_socket; return -errno;
} }
socket_set_nonblock(s->fd); socket_set_nonblock(s->fd);
do { do {
ret = connect(s->fd, (struct sockaddr *)&addr, sizeof(addr)); ret = connect(s->fd, (struct sockaddr *)&addr, sizeof(addr));
if (ret == -1) if (ret == -1) {
ret = -errno; ret = -errno;
}
if (ret == -EINPROGRESS || ret == -EWOULDBLOCK) if (ret == -EINPROGRESS || ret == -EWOULDBLOCK) {
qemu_set_fd_handler2(s->fd, NULL, NULL, unix_wait_for_connect, s); qemu_set_fd_handler2(s->fd, NULL, NULL, unix_wait_for_connect, s);
return 0;
}
} while (ret == -EINTR); } while (ret == -EINTR);
if (ret < 0 && ret != -EINPROGRESS && ret != -EWOULDBLOCK) { if (ret < 0) {
DPRINTF("connect failed\n"); DPRINTF("connect failed\n");
goto err_after_open; migrate_fd_error(s);
return ret;
} }
if (ret >= 0)
migrate_fd_connect(s); migrate_fd_connect(s);
return 0; return 0;
err_after_open:
close(s->fd);
err_after_socket:
return -1;
} }
static void unix_accept_incoming_migration(void *opaque) static void unix_accept_incoming_migration(void *opaque)