diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-10-02 09:59:38 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-10-23 13:54:56 +0200 |
| commit | 342ab8d1e4f8650a22a3a1c9fade31df3fd9c1c1 (patch) | |
| tree | 2ce0bccf82132d1e8afa5923492a32a9f7c7d5d3 | |
| parent | be7059cd7f8998d41f0b44ec13907359d04c63d2 (diff) | |
| download | qemu-342ab8d1e4f8650a22a3a1c9fade31df3fd9c1c1.tar.gz | |
migration: centralize call to migrate_fd_error()
The call to migrate_fd_error() was missing for non-socket backends, so
centralize it in qmp_migrate().
Before:
(qemu) migrate fd:ffff
migrate: An undefined error has occurred
(qemu) info migrate
(qemu)
After:
(qemu) migrate fd:ffff
migrate: An undefined error has occurred
(qemu) info migrate
capabilities: xbzrle: off
Migration status: failed
total time: 0 milliseconds
(The awful error message will be fixed later in the series).
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | migration-tcp.c | 1 | ||||
| -rw-r--r-- | migration-unix.c | 1 | ||||
| -rw-r--r-- | migration.c | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/migration-tcp.c b/migration-tcp.c index 78337a3e29..e8bc76acc6 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -79,7 +79,6 @@ int tcp_start_outgoing_migration(MigrationState *s, const char *host_port, s->fd = inet_nonblocking_connect(host_port, tcp_wait_for_connect, s, &local_err); if (local_err != NULL) { - migrate_fd_error(s); error_propagate(errp, local_err); return -1; } diff --git a/migration-unix.c b/migration-unix.c index 169de88677..d349662498 100644 --- a/migration-unix.c +++ b/migration-unix.c @@ -111,7 +111,6 @@ int unix_start_outgoing_migration(MigrationState *s, const char *path) if (ret < 0) { DPRINTF("connect failed\n"); - migrate_fd_error(s); return ret; } migrate_fd_connect(s); diff --git a/migration.c b/migration.c index b332dae3a4..efea21983a 100644 --- a/migration.c +++ b/migration.c @@ -524,6 +524,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, } if (ret < 0 || local_err) { + migrate_fd_error(s); if (!local_err) { error_set_errno(errp, -ret, QERR_UNDEFINED_ERROR); } else { |