Commit dde3a218 authored by Soramichi AKIYAMA's avatar Soramichi AKIYAMA Committed by Luiz Capitulino
Browse files

hmp: migrate command (without -d) now blocks correctly 



This patch fixes a timing issue that migrate command (without -d) does not
block in some cases.

The original version of hmp.c:hmp_migrate_status_cb checks if the
migration status is 'active' or not to detect the completion of a migration.

However, if this function is executed when the migration status is stil
'setup' (the status before 'active'), migration command returns
immediately even if the user does not specify -d option.

Signed-off-by: default avatarSoramichi Akiyama <akiyama@nii.ac.jp>
Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent 933b19ea

hmp.c

+2 −1
Original line number Diff line number Diff line
@@ -1234,7 +1234,8 @@ static void hmp_migrate_status_cb(void *opaque) 
    MigrationInfo *info;



    info = qmp_query_migrate(NULL);

    if (!info->has_status || strcmp(info->status, "active") == 0) {

    if (!info->has_status || strcmp(info->status, "active") == 0 ||

        strcmp(info->status, "setup") == 0) {

        if (info->has_disk) {

            int progress;