summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYury Kotov2019-11-13 18:53:25 +0100
committerJuan Quintela2020-01-20 09:10:22 +0100
commit603d5a42d3cca58d69dbe9728a47767896486cae (patch)
tree56ec7154865f4aa714321f8f19ec6596c2c10865
parentmigration: Fix incorrect integer->float conversion caught by clang (diff)
downloadqemu-603d5a42d3cca58d69dbe9728a47767896486cae.tar.gz
qemu-603d5a42d3cca58d69dbe9728a47767896486cae.tar.xz
qemu-603d5a42d3cca58d69dbe9728a47767896486cae.zip
migration: Fix the re-run check of the migrate-incoming command
The current check sets an error but doesn't fail the command. This may cause a problem if new connection attempt by the same URI affects the first connection. Signed-off-by: Yury Kotov <yury-kotov@yandex-team.ru> Reviewed-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Darren Kenny <darren.kenny@oracle.com> Signed-off-by: Juan Quintela <quintela@redhat.com>
-rw-r--r--migration/migration.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/migration/migration.c b/migration/migration.c
index f79d0bf89a..e55edee606 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1784,6 +1784,7 @@ void qmp_migrate_incoming(const char *uri, Error **errp)
}
if (!once) {
error_setg(errp, "The incoming migration has already been started");
+ return;
}
qemu_start_incoming_migration(uri, &local_err);