From: Li Zhijian via <qemu-devel@nongnu.org>
To: Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>
Cc: Hailiang Zhang <zhanghailiang@xfusion.com>,
qemu-devel@nongnu.org, Zhang Chen <chen.zhang@intel.com>,
Li Zhijian <lizhijian@fujitsu.com>
Subject: [PATCH 2/3] migration/colo: make colo_incoming_co() return void
Date: Thu, 9 May 2024 11:31:05 +0800 [thread overview]
Message-ID: <20240509033106.1321880-2-lizhijian@fujitsu.com> (raw)
In-Reply-To: <20240509033106.1321880-1-lizhijian@fujitsu.com>
Currently, it always returns 0, no need to check the return value at all.
In addition, enter colo coroutine only if migration_incoming_colo_enabled()
is true.
Once the destination side enters the COLO* state, the COLO process will
take over the remaining processes until COLO exits.
Signed-off-by: Li Zhijian <lizhijian@fujitsu.com>
---
migration/colo.c | 9 ++-------
migration/migration.c | 6 +++---
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/migration/colo.c b/migration/colo.c
index 5600a43d78..991806c06a 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -929,16 +929,13 @@ out:
return NULL;
}
-int coroutine_fn colo_incoming_co(void)
+void coroutine_fn colo_incoming_co(void)
{
MigrationIncomingState *mis = migration_incoming_get_current();
QemuThread th;
assert(bql_locked());
-
- if (!migration_incoming_colo_enabled()) {
- return 0;
- }
+ assert(migration_incoming_colo_enabled());
qemu_thread_create(&th, "COLO incoming", colo_process_incoming_thread,
mis, QEMU_THREAD_JOINABLE);
@@ -954,6 +951,4 @@ int coroutine_fn colo_incoming_co(void)
/* We hold the global BQL, so it is safe here */
colo_release_ram_cache();
-
- return 0;
}
diff --git a/migration/migration.c b/migration/migration.c
index b4a09c561c..6dc1f3bab4 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -789,9 +789,9 @@ process_incoming_migration_co(void *opaque)
goto fail;
}
- if (colo_incoming_co() < 0) {
- error_setg(&local_err, "colo incoming failed");
- goto fail;
+ if (migration_incoming_colo_enabled()) {
+ /* yield until COLO exit */
+ colo_incoming_co();
}
migration_bh_schedule(process_incoming_migration_bh, mis);
--
2.31.1
next prev parent reply other threads:[~2024-05-09 3:29 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-09 3:31 [PATCH 1/3] migration/colo: Minor fix for colo error message Li Zhijian via
2024-05-09 3:31 ` Li Zhijian via [this message]
2024-05-09 13:37 ` [PATCH 2/3] migration/colo: make colo_incoming_co() return void Peter Xu
2024-05-11 2:51 ` Zhang, Chen
2024-05-15 19:04 ` Fabiano Rosas
2024-05-16 3:37 ` Zhijian Li (Fujitsu) via
2024-05-09 3:31 ` [PATCH 3/3] migration/colo: Tidy up bql_unlock() around bdrv_activate_all() Li Zhijian via
2024-05-09 13:38 ` Peter Xu
2024-05-11 2:51 ` Zhang, Chen
2024-05-09 13:33 ` [PATCH 1/3] migration/colo: Minor fix for colo error message Peter Xu
2024-05-11 2:51 ` Zhang, Chen
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=20240509033106.1321880-2-lizhijian@fujitsu.com \
--to=qemu-devel@nongnu.org \
--cc=chen.zhang@intel.com \
--cc=farosas@suse.de \
--cc=lizhijian@fujitsu.com \
--cc=peterx@redhat.com \
--cc=zhanghailiang@xfusion.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 read-only IMAP folder(s) and NNTP newsgroup(s).