From: Avihai Horon <avihaih@nvidia.com>
Date: Sun, 31 Dec 2023 09:30:10 +0000 (+0200)
Subject: migration/multifd: Fix error message in multifd_recv_initial_packet()
X-Git-Tag: v9.0.0-rc0~124^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c77b40859a5201f01b44dc475258405e289c431f;p=thirdparty%2Fqemu.git

migration/multifd: Fix error message in multifd_recv_initial_packet()

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>
---

diff --git a/migration/multifd.c b/migration/multifd.c
index 409460684f2..a6204fc72f4 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;
     }