summary refs log tree commit diff stats
path: root/migration-tcp.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2012-10-02 09:59:38 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2012-10-23 13:54:56 +0200
commit342ab8d1e4f8650a22a3a1c9fade31df3fd9c1c1 (patch)
tree2ce0bccf82132d1e8afa5923492a32a9f7c7d5d3 /migration-tcp.c
parentbe7059cd7f8998d41f0b44ec13907359d04c63d2 (diff)
downloadfocaccia-qemu-342ab8d1e4f8650a22a3a1c9fade31df3fd9c1c1.tar.gz
focaccia-qemu-342ab8d1e4f8650a22a3a1c9fade31df3fd9c1c1.zip
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>
Diffstat (limited to 'migration-tcp.c')
-rw-r--r--migration-tcp.c1
1 files changed, 0 insertions, 1 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;
     }