From: Yury Kotov <yury-kotov@yandex-team.ru>
Date: Wed, 13 Nov 2019 17:53:25 +0000 (+0300)
Subject: migration: Fix the re-run check of the migrate-incoming command
X-Git-Tag: qemu-xen-4.14.0~190^2~20
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=603d5a42d3cca58d69dbe9728a47767896486cae;p=qemu-xen.git

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>
---

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);