migration/multifd: Remove error_setg() in migration_ioc_process_incoming()
authorAvihai Horon <avihaih@nvidia.com>
Sun, 31 Dec 2023 09:30:13 +0000 (11:30 +0200)
committerPeter Xu <peterx@redhat.com>
Thu, 4 Jan 2024 01:52:42 +0000 (09:52 +0800)
If multifd_load_setup() fails in migration_ioc_process_incoming(),
error_setg() is called with errp. This will lead to an assert because in
that case errp already contains an error.

Fix it by removing the redundant error_setg().

Fixes: 6720c2b32725 ("migration: check magic value for deciding the mapping of channels")
Signed-off-by: Avihai Horon <avihaih@nvidia.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Link: https://lore.kernel.org/r/20231231093016.14204-9-avihaih@nvidia.com
Signed-off-by: Peter Xu <peterx@redhat.com>
migration/migration.c

index 8bb1a8134edd6e87dd3ef4c6d01fdc8d863668f4..9524c22a50a29eee2932b7f9f3c26bae604394ee 100644 (file)
@@ -843,7 +843,6 @@ void migration_ioc_process_incoming(QIOChannel *ioc, Error **errp)
     }
 
     if (multifd_load_setup(errp) != 0) {
-        error_setg(errp, "Failed to setup multifd channels");
         return;
     }