From: leirao <lei.rao@intel.com>
To: chen.zhang@intel.com, lizhijian@cn.fujitsu.com,
jasowang@redhat.com, quintela@redhat.com, dgilbert@redhat.com,
pbonzini@redhat.com, lukasstraub2@web.de
Cc: "Rao, Lei" <lei.rao@intel.com>, qemu-devel@nongnu.org
Subject: [PATCH v6 04/10] Remove migrate_set_block_enabled in checkpoint
Date: Thu, 8 Apr 2021 23:20:50 -0400 [thread overview]
Message-ID: <1617938456-315058-5-git-send-email-lei.rao@intel.com> (raw)
In-Reply-To: <1617938456-315058-1-git-send-email-lei.rao@intel.com>
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>
---
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 de27662..1aaf316 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 8ca0341..c85b926 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2227,6 +2227,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");
--
1.8.3.1
next prev parent reply other threads:[~2021-04-09 3:43 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-09 3:20 [PATCH v6 00/10] Fixed some bugs and optimized some codes for COLO leirao
2021-04-09 3:20 ` [PATCH v6 01/10] Remove some duplicate trace code leirao
2021-04-09 3:20 ` [PATCH v6 02/10] Fix the qemu crash when guest shutdown during checkpoint leirao
2021-04-09 3:20 ` [PATCH v6 03/10] Optimize the function of filter_send leirao
2021-04-09 3:20 ` leirao [this message]
2021-04-09 3:20 ` [PATCH v6 05/10] Add a function named packet_new_nocopy for COLO leirao
2021-05-18 1:45 ` Zhang, Chen
2021-04-09 3:20 ` [PATCH v6 06/10] Add the function of colo_compare_cleanup leirao
2021-04-09 3:20 ` [PATCH v6 07/10] Reset the auto-converge counter at every checkpoint leirao
2021-04-09 3:20 ` [PATCH v6 08/10] Reduce the PVM stop time during Checkpoint leirao
2021-04-09 3:20 ` [PATCH v6 09/10] Add the function of colo_bitmap_clear_dirty leirao
2021-04-16 7:56 ` Rao, Lei
2021-04-27 2:32 ` Rao, Lei
2021-04-09 3:20 ` [PATCH v6 10/10] Fixed calculation error of pkt->header_size in fill_pkt_tcp_info() leirao
2021-05-17 19:46 ` [PATCH v6 00/10] Fixed some bugs and optimized some codes for COLO Lukas Straub
2021-05-18 1:33 ` Zhang, Chen
2021-06-18 2:52 ` chen.zhang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1617938456-315058-5-git-send-email-lei.rao@intel.com \
--to=lei.rao@intel.com \
--cc=chen.zhang@intel.com \
--cc=dgilbert@redhat.com \
--cc=jasowang@redhat.com \
--cc=lizhijian@cn.fujitsu.com \
--cc=lukasstraub2@web.de \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).