QEMU-Devel Archive mirror
 help / color / mirror / Atom feed
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 1/3] migration/colo: Minor fix for colo error message
Date: Thu,  9 May 2024 11:31:04 +0800	[thread overview]
Message-ID: <20240509033106.1321880-1-lizhijian@fujitsu.com> (raw)

- Explicitly show the missing module name: replication
- Fix capability name to x-colo

Signed-off-by: Li Zhijian <lizhijian@fujitsu.com>
---
 migration/migration.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/migration/migration.c b/migration/migration.c
index 6502e169a3..b4a09c561c 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -517,13 +517,13 @@ void migration_incoming_disable_colo(void)
 int migration_incoming_enable_colo(void)
 {
 #ifndef CONFIG_REPLICATION
-    error_report("ENABLE_COLO command come in migration stream, but COLO "
-                 "module is not built in");
+    error_report("ENABLE_COLO command come in migration stream, but the "
+                 "replication module is not built in");
     return -ENOTSUP;
 #endif
 
     if (!migrate_colo()) {
-        error_report("ENABLE_COLO command come in migration stream, but c-colo "
+        error_report("ENABLE_COLO command come in migration stream, but x-colo "
                      "capability is not set");
         return -EINVAL;
     }
-- 
2.31.1



             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 Li Zhijian via [this message]
2024-05-09  3:31 ` [PATCH 2/3] migration/colo: make colo_incoming_co() return void Li Zhijian via
2024-05-09 13:37   ` 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-1-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).