[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 25/28] migration: propagate error correctly
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 25/28] migration: propagate error correctly |
Date: |
Wed, 23 Feb 2011 22:47:34 +0100 |
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 callwill be retry later.
Signed-off-by: Juan Quintela <address@hidden>
---
migration-tcp.c | 20 +++++++++++---------
migration-unix.c | 26 ++++++++++----------------
2 files changed, 21 insertions(+), 25 deletions(-)
diff --git a/migration-tcp.c b/migration-tcp.c
index 6acf6c6..ffe8ed6 100644
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -91,26 +91,28 @@ int tcp_start_outgoing_migration(MigrationState *s, const
char *host_port)
s->fd = qemu_socket(PF_INET, SOCK_STREAM, 0);
if (s->fd == -1) {
- return -1;
+ return -socket_error();
}
socket_set_nonblock(s->fd);
do {
ret = connect(s->fd, (struct sockaddr *)&addr, sizeof(addr));
- if (ret == -1)
- ret = -(socket_error());
-
- if (ret == -EINPROGRESS || ret == -EWOULDBLOCK)
+ if (ret == -1) {
+ ret = -socket_error();
+ }
+ if (ret == -EINPROGRESS || ret == -EWOULDBLOCK) {
qemu_set_fd_handler2(s->fd, NULL, NULL, tcp_wait_for_connect, s);
+ return 0;
+ }
} while (ret == -EINTR);
- if (ret < 0 && ret != -EINPROGRESS && ret != -EWOULDBLOCK) {
+ if (ret < 0) {
DPRINTF("connect failed\n");
migrate_fd_error(s);
- } else if (ret >= 0)
- migrate_fd_connect(s);
-
+ return ret;
+ }
+ migrate_fd_connect(s);
return 0;
}
diff --git a/migration-unix.c b/migration-unix.c
index f9e7266..8563bbb 100644
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -90,35 +90,29 @@ int unix_start_outgoing_migration(MigrationState *s, const
char *path)
s->fd = qemu_socket(PF_UNIX, SOCK_STREAM, 0);
if (s->fd < 0) {
DPRINTF("Unable to open socket");
- goto err_after_socket;
+ return -errno;
}
socket_set_nonblock(s->fd);
do {
ret = connect(s->fd, (struct sockaddr *)&addr, sizeof(addr));
- if (ret == -1)
+ if (ret == -1) {
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);
+ return 0;
+ }
} while (ret == -EINTR);
- if (ret < 0 && ret != -EINPROGRESS && ret != -EWOULDBLOCK) {
+ if (ret < 0) {
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;
-
-err_after_open:
- close(s->fd);
-
-err_after_socket:
- return -1;
}
static void unix_accept_incoming_migration(void *opaque)
--
1.7.4
- [Qemu-devel] [PATCH 07/28] migration: move migrate_create_state to do_migrate, (continued)
- [Qemu-devel] [PATCH 05/28] migration: Refactor MigrationState creation, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 23/28] migration: add error handling to migrate_fd_put_notify()., Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 22/28] savevm: avoid qemu_savevm_state_iteate() to return 1 when qemu file has error., Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 24/28] migration: Don't use callback on file defining it, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 25/28] migration: propagate error correctly,
Juan Quintela <=
- [Qemu-devel] [PATCH 26/28] migration: qemu_savevm_iterate has three return values, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 27/28] migration: If there is one error, it makes no sense to continue, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 28/28] migration: make migration-{tcp, unix} consistent, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 11/28] migration: Introduce migrate_fd_completed() for consistenncy, Juan Quintela, 2011/02/23
- [Qemu-devel] [PATCH 15/28] migration: Move exported functions to the end of the file, Juan Quintela, 2011/02/23