| Message ID | 20200224065414.36524-2-zhang.zhanghailiang@huawei.com |
|---|---|
| State | New |
| Headers | show |
| Series | [V2,1/8] migration: fix COLO broken caused by a previous commit | expand |
zhanghailiang <zhang.zhanghailiang@huawei.com> wrote: > 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> oops sorry. Reviewed-by: Juan Quintela <quintela@redhat.com> queued.
diff --git a/migration/migration.c b/migration/migration.c index 8fb68795dc..06d1ff9d56 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -865,7 +865,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:
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> --- migration/migration.c | 1 - 1 file changed, 1 deletion(-)