Commit 4debb5f5 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Juan Quintela
Browse files

migrate_incoming: Cleanup/clarify error messages 



Create a separate error for the case where migrate_incoming is
used after a succesful migrate_incoming.

Reword the error in the case where '-incoming defer' is missing
to omit the command name so it's right for both hmp and qmp.

Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarAmit Shah <amit.shah@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent d8760534

migration/migration.c

+6 −2
Original line number Diff line number Diff line
@@ -434,11 +434,15 @@ void migrate_del_blocker(Error *reason) 
void qmp_migrate_incoming(const char *uri, Error **errp)

{

    Error *local_err = NULL;

    static bool once = true;



    if (!deferred_incoming) {

        error_setg(errp, "'-incoming defer' is required for migrate_incoming");

        error_setg(errp, "For use with '-incoming defer'");

        return;

    }

    if (!once) {

        error_setg(errp, "The incoming migration has already been started");

    }



    qemu_start_incoming_migration(uri, &local_err);
@@ -447,7 +451,7 @@ void qmp_migrate_incoming(const char *uri, Error **errp) 
        return;

    }



    deferred_incoming = false;

    once = false;

}



void qmp_migrate(const char *uri, bool has_blk, bool blk,