OSDN Git Service

migration: fix COLO broken caused by a previous commit
authorzhanghailiang <zhang.zhanghailiang@huawei.com>
Mon, 24 Feb 2020 06:54:07 +0000 (14:54 +0800)
committerJuan Quintela <quintela@redhat.com>
Fri, 28 Feb 2020 09:13:54 +0000 (10:13 +0100)
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

index c1814a6..9227225 100644 (file)
@@ -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: