diff mbox series

[PULL,13/15] migration: fix COLO broken caused by a previous commit

Message ID 20200228092420.103757-14-quintela@redhat.com
State New
Headers show
Series [PULL,01/15] multifd: Add multifd-compression parameter | expand

Commit Message

Juan Quintela Feb. 28, 2020, 9:24 a.m. UTC 
From: zhanghailiang <zhang.zhanghailiang@huawei.com>

This commit "migration: Create migration_is_running()" broke
COLO. Becuase there is a process broken by this commit.

colo_process_checkpoint
 ->colo_do_checkpoint_transaction
   ->migrate_set_block_enabled
     ->qmp_migrate_set_capabilities

It can be fixed by make COLO process as an exception,
Maybe we need a better way to fix it.

Cc: Juan Quintela <quintela@redhat.com>
Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 migration/migration.c | 1 -
 1 file changed, 1 deletion(-)
diff mbox series

Patch

diff --git a/migration/migration.c b/migration/migration.c
index c1814a6861..92272250f4 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -876,7 +876,6 @@  bool migration_is_running(int state)
     case MIGRATION_STATUS_DEVICE:
     case MIGRATION_STATUS_WAIT_UNPLUG:
     case MIGRATION_STATUS_CANCELLING:
-    case MIGRATION_STATUS_COLO:
         return true;
 
     default: