migration: Fix the re-run check of the migrate-incoming command
diff mbox series

Message ID 20191113175325.29765-1-yury-kotov@yandex-team.ru
State New
Headers show
Series
  • migration: Fix the re-run check of the migrate-incoming command
Related show

Commit Message

Yury Kotov Nov. 13, 2019, 5:53 p.m. UTC
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>
---
 migration/migration.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Darren Kenny Nov. 14, 2019, 1:50 p.m. UTC | #1
On Wed, Nov 13, 2019 at 08:53:25PM +0300, Yury Kotov wrote:
>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: Darren Kenny <darren.kenny@oracle.com>

>---
> migration/migration.c | 1 +
> 1 file changed, 1 insertion(+)
>
>diff --git a/migration/migration.c b/migration/migration.c
>index 354ad072fa..fa2005b49f 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);
>-- 
>2.24.0
>
>

Patch
diff mbox series

diff --git a/migration/migration.c b/migration/migration.c
index 354ad072fa..fa2005b49f 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);