commit dde3a2184074f5c4279fd7fbfc597b5dc5859fb8
author Soramichi AKIYAMA <akiyama@nii.ac.jp> Mon Jan 27 19:46:11 2014 +0900
committer Luiz Capitulino <lcapitulino@redhat.com> Mon Feb 17 11:57:22 2014 -0500
tree a4f12cb3d4a26d7259316dbea89e88857df7ecb1
parent 933b19ea9784de7ed2eb6e10262b9363c5c03ed7

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 <akiyama@nii.ac.jp>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>

hmp.c

diff --git a/hmp.c b/hmp.c
index 1af0809..081c121 100644
--- a/hmp.c
+++ b/hmp.c
@@ -1234,7 +1234,8 @@
     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;