From: peterx@redhat.com
To: qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>
Cc: Fabiano Rosas <farosas@suse.de>,
Steve Sistare <steven.sistare@oracle.com>,
Juan Quintela <quintela@trasno.org>,
peterx@redhat.com,
Leonardo Bras Soares Passos <lsoaresp@redhat.com>,
Avihai Horon <avihaih@nvidia.com>
Subject: [PULL 19/26] migration/multifd: Fix error message in multifd_recv_initial_packet()
Date: Thu, 4 Jan 2024 12:32:04 +0800 [thread overview]
Message-ID: <20240104043213.431566-20-peterx@redhat.com> (raw)
In-Reply-To: <20240104043213.431566-1-peterx@redhat.com>
From: Avihai Horon <avihaih@nvidia.com>
In multifd_recv_initial_packet(), if MultiFDInit_t->id is greater than
the configured number of multifd channels, an irrelevant error message
about multifd version is printed.
Change the error message to a relevant one about the channel id.
Signed-off-by: Avihai Horon <avihaih@nvidia.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Link: https://lore.kernel.org/r/20231231093016.14204-6-avihaih@nvidia.com
Signed-off-by: Peter Xu <peterx@redhat.com>
---
migration/multifd.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/migration/multifd.c b/migration/multifd.c
index 409460684f..a6204fc72f 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -228,8 +228,8 @@ static int multifd_recv_initial_packet(QIOChannel *c, Error **errp)
}
if (msg.id > migrate_multifd_channels()) {
- error_setg(errp, "multifd: received channel version %u "
- "expected %u", msg.version, MULTIFD_VERSION);
+ error_setg(errp, "multifd: received channel id %u is greater than "
+ "number of channels %u", msg.id, migrate_multifd_channels());
return -1;
}
--
2.41.0
next prev parent reply other threads:[~2024-01-04 4:34 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-04 4:31 [PULL 00/26] Migration 20240104 patches peterx
2024-01-04 4:31 ` [PULL 01/26] MAINTAINERS: Leaving Migration peterx
2024-01-04 4:31 ` [PULL 02/26] MAINTAINERS: Remove myself as reviewer from Live Migration peterx
2024-01-04 4:31 ` [PULL 03/26] cpus: vm_was_suspended peterx
2024-01-04 4:31 ` [PULL 04/26] cpus: stop vm in suspended runstate peterx
2024-01-04 4:31 ` [PULL 05/26] cpus: check running not RUN_STATE_RUNNING peterx
2024-01-04 4:31 ` [PULL 06/26] cpus: vm_resume peterx
2024-01-04 4:31 ` [PULL 07/26] migration: propagate suspended runstate peterx
2024-01-04 4:31 ` [PULL 08/26] migration: preserve " peterx
2024-01-04 4:31 ` [PULL 09/26] migration: preserve suspended for snapshot peterx
2024-01-04 4:31 ` [PULL 10/26] migration: preserve suspended for bg_migration peterx
2024-01-04 4:31 ` [PULL 11/26] tests/qtest: migration events peterx
2024-01-04 4:31 ` [PULL 12/26] tests/qtest: option to suspend during migration peterx
2024-01-04 4:31 ` [PULL 13/26] tests/qtest: precopy migration with suspend peterx
2024-01-04 4:31 ` [PULL 14/26] tests/qtest: postcopy " peterx
2024-01-04 4:32 ` [PULL 15/26] migration: Remove migrate_max_downtime() declaration peterx
2024-01-04 4:32 ` [PULL 16/26] migration: Remove nulling of hostname in migrate_init() peterx
2024-01-04 4:32 ` [PULL 17/26] migration: Refactor migration_incoming_setup() peterx
2024-01-04 4:32 ` [PULL 18/26] migration: Remove errp parameter in migration_fd_process_incoming() peterx
2024-01-04 4:32 ` peterx [this message]
2024-01-04 4:32 ` [PULL 20/26] migration/multifd: Simplify multifd_channel_connect() if else statement peterx
2024-01-04 4:32 ` [PULL 21/26] migration/multifd: Fix leaking of Error in TLS error flow peterx
2024-01-04 4:32 ` [PULL 22/26] migration/multifd: Remove error_setg() in migration_ioc_process_incoming() peterx
2024-01-04 4:32 ` [PULL 23/26] migration: Fix migration_channel_read_peek() error path peterx
2024-01-04 4:32 ` [PULL 24/26] migration: Remove unnecessary usage of local Error peterx
2024-01-04 4:32 ` [PULL 25/26] migration/multifd: " peterx
2024-01-04 4:32 ` [PULL 26/26] migration: fix coverity migrate_mode finding peterx
2024-01-05 16:08 ` [PULL 00/26] Migration 20240104 patches Peter Maydell
2024-01-07 12:33 ` Peter Xu
2024-01-07 12:41 ` Stefan Hajnoczi
2024-01-07 15:23 ` Peter Maydell
2024-01-07 16:28 ` Stefan Hajnoczi
2024-01-08 2:10 ` Peter Xu
2024-01-08 2:34 ` Peter Xu
2024-01-08 15:22 ` Peter Maydell
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=20240104043213.431566-20-peterx@redhat.com \
--to=peterx@redhat.com \
--cc=avihaih@nvidia.com \
--cc=farosas@suse.de \
--cc=lsoaresp@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@trasno.org \
--cc=stefanha@redhat.com \
--cc=steven.sistare@oracle.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).