diff mbox series

[PULL,22/26] migration/multifd: Remove error_setg() in migration_ioc_process_incoming()

Message ID 20240104043213.431566-23-peterx@redhat.com
State New
Headers show
Series [PULL,01/26] MAINTAINERS: Leaving Migration | expand

Commit Message

Peter Xu Jan. 4, 2024, 4:32 a.m. UTC 
From: Avihai Horon <avihaih@nvidia.com>

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 | 1 -
 1 file changed, 1 deletion(-)
diff mbox series

Patch

diff --git a/migration/migration.c b/migration/migration.c
index 8bb1a8134e..9524c22a50 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -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;
     }