[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 06/18] migration: centralize call to migrate_fd_
From: |
Luiz Capitulino |
Subject: |
Re: [Qemu-devel] [PATCH 06/18] migration: centralize call to migrate_fd_error() |
Date: |
Thu, 4 Oct 2012 15:11:42 -0300 |
On Wed, 3 Oct 2012 16:36:53 +0200
Paolo Bonzini <address@hidden> 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 <address@hidden>
Reviewed-by: Luiz Capitulino <address@hidden>
> ---
> 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 {
- Re: [Qemu-devel] [PATCH 03/18] qemu-sockets: unix_listen and unix_connect are portable, (continued)
- [Qemu-devel] [PATCH 05/18] migration: avoid using error_is_set, Paolo Bonzini, 2012/10/03
- [Qemu-devel] [PATCH 04/18] qemu-sockets: add nonblocking connect for Unix sockets, Paolo Bonzini, 2012/10/03
- [Qemu-devel] [PATCH 06/18] migration: centralize call to migrate_fd_error(), Paolo Bonzini, 2012/10/03
- Re: [Qemu-devel] [PATCH 06/18] migration: centralize call to migrate_fd_error(),
Luiz Capitulino <=
- [Qemu-devel] [PATCH 07/18] migration: use qemu-sockets to establish Unix sockets, Paolo Bonzini, 2012/10/03
- [Qemu-devel] [PATCH 09/18] migration (incoming): add error propagation for fd and exec protocols, Paolo Bonzini, 2012/10/03
- [Qemu-devel] [PATCH 08/18] migration (outgoing): add error propagation for fd and exec protocols, Paolo Bonzini, 2012/10/03
[Qemu-devel] [PATCH 11/18] nbd: ask and print error information from qemu-sockets, Paolo Bonzini, 2012/10/03