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: Soramichi Akiyama <[email protected]> Signed-off-by: Luiz Capitulino <[email protected]>
cshorler · Feb 17, 2014 · dde3a21 · dde3a21
1 parent 933b19e
commit dde3a21
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/hmp.c b/hmp.c
@@ -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;