From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:55329)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1TJpsq-0002sP-BC
	for qemu-devel@nongnu.org; Thu, 04 Oct 2012 14:10:53 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1TJpsp-0008QL-52
	for qemu-devel@nongnu.org; Thu, 04 Oct 2012 14:10:52 -0400
Received: from mx1.redhat.com ([209.132.183.28]:4218)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1TJpso-0008PN-S0
	for qemu-devel@nongnu.org; Thu, 04 Oct 2012 14:10:51 -0400
Received: from int-mx09.intmail.prod.int.phx2.redhat.com
	(int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22])
	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q94IAn61018981
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <qemu-devel@nongnu.org>; Thu, 4 Oct 2012 14:10:50 -0400
Date: Thu, 4 Oct 2012 15:11:42 -0300
From: Luiz Capitulino <lcapitulino@redhat.com>
Message-ID: <20121004151142.5a03fee6@doriath.home>
In-Reply-To: <1349275025-5093-7-git-send-email-pbonzini@redhat.com>
References: <1349275025-5093-1-git-send-email-pbonzini@redhat.com>
	<1349275025-5093-7-git-send-email-pbonzini@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 06/18] migration: centralize call to
	migrate_fd_error()
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-devel@nongnu.org

On Wed,  3 Oct 2012 16:36:53 +0200
Paolo Bonzini <pbonzini@redhat.com> wrote:

> 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 <pbonzini@redhat.com>

Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>

> ---
>  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 {