commit 603d5a42d3cca58d69dbe9728a47767896486cae
author Yury Kotov <yury-kotov@yandex-team.ru> Wed Nov 13 20:53:25 2019 +0300
committer Juan Quintela <quintela@redhat.com> Mon Jan 20 09:10:22 2020 +0100
tree 56ec7154865f4aa714321f8f19ec6596c2c10865
parent 2667c98722ddec12c9f43902c6c5668023e1dce9

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>

migration/migration.c

diff --git a/migration/migration.c b/migration/migration.c
index f79d0bf..e55edee 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1784,6 +1784,7 @@
     }
     if (!once) {
         error_setg(errp, "The incoming migration has already been started");
+        return;
     }
 
     qemu_start_incoming_migration(uri, &local_err);