mirrors
/
qemu
mirror of https://gitlab.com/qemu-project/qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Dr. David Alan Gilbert 2015-02-26 14:54:41 +00:00 committed by Juan Quintela
parent d876053478
commit 4debb5f553
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
migration/migration.c
View File

@ -434,11 +434,15 @@ void migrate_del_blocker(Error *reason)
void qmp_migrate_incoming(const char *uri, Error **errp) void qmp_migrate_incoming(const char *uri, Error **errp)
{ {
Error *local_err = NULL; Error *local_err = NULL;
static bool once = true;
if (!deferred_incoming) { if (!deferred_incoming) {
error_setg(errp, "'-incoming defer' is required for migrate_incoming"); error_setg(errp, "For use with '-incoming defer'");
return; return;
} }
if (!once) {
error_setg(errp, "The incoming migration has already been started");
}
qemu_start_incoming_migration(uri, &local_err); qemu_start_incoming_migration(uri, &local_err);
@ -447,7 +451,7 @@ void qmp_migrate_incoming(const char *uri, Error **errp)
return; return;
} }
deferred_incoming = false; once = false;
} }
void qmp_migrate(const char *uri, bool has_blk, bool blk, void qmp_migrate(const char *uri, bool has_blk, bool blk,