[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/3] migrate_incoming: Cleanup/clarify error message
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PATCH 3/3] migrate_incoming: Cleanup/clarify error messages |
Date: |
Thu, 26 Feb 2015 14:54:41 +0000 |
From: "Dr. David Alan Gilbert" <address@hidden>
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 <address@hidden>
---
migration/migration.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 2c805f1..e6ac3de 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -435,11 +435,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);
@@ -448,7 +452,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,
--
2.1.0