[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/15] migration: fix COLO broken caused by a previous commit
From: |
Juan Quintela |
Subject: |
[PULL 13/15] migration: fix COLO broken caused by a previous commit |
Date: |
Fri, 28 Feb 2020 10:24:18 +0100 |
From: zhanghailiang <address@hidden>
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 <address@hidden>
Signed-off-by: zhanghailiang <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
migration/migration.c | 1 -
1 file changed, 1 deletion(-)
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:
--
2.24.1
- [PULL 03/15] multifd: Make no compression operations into its own structure, (continued)
- [PULL 03/15] multifd: Make no compression operations into its own structure, Juan Quintela, 2020/02/28
- [PULL 04/15] multifd: Add multifd-zlib-level parameter, Juan Quintela, 2020/02/28
- [PULL 06/15] configure: Enable test and libs for zstd, Juan Quintela, 2020/02/28
- [PULL 05/15] multifd: Add zlib compression multifd support, Juan Quintela, 2020/02/28
- [PULL 07/15] multifd: Add multifd-zstd-level parameter, Juan Quintela, 2020/02/28
- [PULL 08/15] multifd: Add zstd compression multifd support, Juan Quintela, 2020/02/28
- [PULL 09/15] migration/vmstate: Remove redundant statement in vmstate_save_state_v(), Juan Quintela, 2020/02/28
- [PULL 10/15] test-vmstate: Fix memleaks in test_load_qlist, Juan Quintela, 2020/02/28
- [PULL 11/15] migration/savevm: release gslist after dump_vmstate_json, Juan Quintela, 2020/02/28
- [PULL 12/15] migration/block: rename BLOCK_SIZE macro, Juan Quintela, 2020/02/28
- [PULL 13/15] migration: fix COLO broken caused by a previous commit,
Juan Quintela <=
- [PULL 14/15] migration/colo: wrap incoming checkpoint process into new helper, Juan Quintela, 2020/02/28
- [PULL 15/15] savevm: Don't call colo_init_ram_cache twice, Juan Quintela, 2020/02/28
- Re: [PULL 00/15] Pull migration patches, Peter Maydell, 2020/02/28