From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37940) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJQ4z-0004Xh-Na for qemu-devel@nongnu.org; Wed, 03 Oct 2012 10:37:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TJQ4v-0000I1-6F for qemu-devel@nongnu.org; Wed, 03 Oct 2012 10:37:41 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:39719) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJQ4u-0000Cn-Rb for qemu-devel@nongnu.org; Wed, 03 Oct 2012 10:37:37 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp2so10061642pbb.4 for ; Wed, 03 Oct 2012 07:37:36 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 3 Oct 2012 16:36:53 +0200 Message-Id: <1349275025-5093-7-git-send-email-pbonzini@redhat.com> In-Reply-To: <1349275025-5093-1-git-send-email-pbonzini@redhat.com> References: <1349275025-5093-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 06/18] migration: centralize call to migrate_fd_error() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lcapitulino@redhat.com 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). Signed-off-by: Paolo Bonzini --- migration-tcp.c | 1 - migration-unix.c | 1 - migration.c | 1 + 3 file modificati, 1 inserzione(+), 2 rimozioni(-) diff --git a/migration-tcp.c b/migration-tcp.c index 78337a3..e8bc76a 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 169de88..d349662 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 8a04174..a56358e 100644 --- a/migration.c +++ b/migration.c @@ -522,6 +522,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 { -- 1.7.12.1