[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/12] Remove migrate_set_block_enabled in checkpoint
From: |
Jason Wang |
Subject: |
[PULL 09/12] Remove migrate_set_block_enabled in checkpoint |
Date: |
Fri, 11 Jun 2021 14:00:21 +0800 |
From: "Rao, Lei" <lei.rao@intel.com>
We can detect disk migration in migrate_prepare, if disk migration
is enabled in COLO mode, we can directly report an error.and there
is no need to disable block migration at every checkpoint.
Signed-off-by: Lei Rao <lei.rao@intel.com>
Signed-off-by: Zhang Chen <chen.zhang@intel.com>
Reviewed-by: Li Zhijian <lizhijian@fujitsu.com>
Reviewed-by: Zhang Chen <chen.zhang@intel.com>
Reviewed-by: Lukas Straub <lukasstraub2@web.de>
Tested-by: Lukas Straub <lukasstraub2@web.de>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
migration/colo.c | 6 ------
migration/migration.c | 4 ++++
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/migration/colo.c b/migration/colo.c
index e498fdb..79fa1f6 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -435,12 +435,6 @@ static int colo_do_checkpoint_transaction(MigrationState
*s,
if (failover_get_state() != FAILOVER_STATUS_NONE) {
goto out;
}
-
- /* Disable block migration */
- migrate_set_block_enabled(false, &local_err);
- if (local_err) {
- goto out;
- }
qemu_mutex_lock_iothread();
#ifdef CONFIG_REPLICATION
diff --git a/migration/migration.c b/migration/migration.c
index 393299e..4828997 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2217,6 +2217,10 @@ static bool migrate_prepare(MigrationState *s, bool blk,
bool blk_inc,
}
if (blk || blk_inc) {
+ if (migrate_colo_enabled()) {
+ error_setg(errp, "No disk migration is required in COLO mode");
+ return false;
+ }
if (migrate_use_block() || migrate_use_block_incremental()) {
error_setg(errp, "Command options are incompatible with "
"current migration capabilities");
--
2.7.4
- [PULL 00/12] Net patches, Jason Wang, 2021/06/11
- [PULL 01/12] vhost-vdpa: skip ram device from the IOTLB mapping, Jason Wang, 2021/06/11
- [PULL 03/12] vhost-vdpa: don't initialize backend_features, Jason Wang, 2021/06/11
- [PULL 02/12] vhost-vdpa: map virtqueue notification area if possible, Jason Wang, 2021/06/11
- [PULL 04/12] vhost-vdpa: remove the unused vhost_vdpa_get_acked_features(), Jason Wang, 2021/06/11
- [PULL 05/12] netdev: add more commands to preconfig mode, Jason Wang, 2021/06/11
- [PULL 07/12] Fix the qemu crash when guest shutdown during checkpoint, Jason Wang, 2021/06/11
- [PULL 08/12] Optimize the function of filter_send, Jason Wang, 2021/06/11
- [PULL 09/12] Remove migrate_set_block_enabled in checkpoint,
Jason Wang <=
- [PULL 06/12] Remove some duplicate trace code., Jason Wang, 2021/06/11
- [PULL 10/12] Add a function named packet_new_nocopy for COLO., Jason Wang, 2021/06/11
- [PULL 12/12] Fixed calculation error of pkt->header_size in fill_pkt_tcp_info(), Jason Wang, 2021/06/11
- [PULL 11/12] Add the function of colo_compare_cleanup, Jason Wang, 2021/06/11
- Re: [PULL 00/12] Net patches, Peter Maydell, 2021/06/11
- Re: [PULL 00/12] Net patches, no-reply, 2021/06/14