summaryrefslogtreecommitdiffstats
path: root/migration/migration.c
diff options
context:
space:
mode:
authorzhanghailiang2020-02-24 07:54:07 +0100
committerJuan Quintela2020-02-28 10:13:54 +0100
commit0306dae5ac47dfbcc1b166b9e2deb13fc4d5a011 (patch)
treed9fc1973d2dd9dd28f73f077d1819989ebae9880 /migration/migration.c
parentmigration/block: rename BLOCK_SIZE macro (diff)
downloadqemu-0306dae5ac47dfbcc1b166b9e2deb13fc4d5a011.tar.gz
qemu-0306dae5ac47dfbcc1b166b9e2deb13fc4d5a011.tar.xz
qemu-0306dae5ac47dfbcc1b166b9e2deb13fc4d5a011.zip
migration: fix COLO broken caused by a previous commit
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>
Diffstat (limited to 'migration/migration.c')
-rw-r--r--migration/migration.c1
1 files changed, 0 insertions, 1 deletions
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: