ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Paolo Bonzini 2012-10-02 09:59:38 +02:00
parent be7059cd7f
commit 342ab8d1e4
3 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
migration-tcp.c
View File

@ -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); s->fd = inet_nonblocking_connect(host_port, tcp_wait_for_connect, s, &local_err);
if (local_err != NULL) { if (local_err != NULL) {
migrate_fd_error(s);
error_propagate(errp, local_err); error_propagate(errp, local_err);
return -1; return -1;
} }

1
migration-unix.c
View File

@ -111,7 +111,6 @@ int unix_start_outgoing_migration(MigrationState *s, const char *path)
if (ret < 0) { if (ret < 0) {
DPRINTF("connect failed\n"); DPRINTF("connect failed\n");
migrate_fd_error(s);
return ret; return ret;
} }
migrate_fd_connect(s); migrate_fd_connect(s);

1
migration.c
View File

@ -524,6 +524,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
} }
if (ret < 0 || local_err) { if (ret < 0 || local_err) {
migrate_fd_error(s);
if (!local_err) { if (!local_err) {
error_set_errno(errp, -ret, QERR_UNDEFINED_ERROR); error_set_errno(errp, -ret, QERR_UNDEFINED_ERROR);
} else { } else {