[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 22/26] migration/multifd: Remove error_setg() in migration_ioc_pro
From: |
peterx |
Subject: |
[PULL 22/26] migration/multifd: Remove error_setg() in migration_ioc_process_incoming() |
Date: |
Thu, 4 Jan 2024 12:32:07 +0800 |
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 --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;
}
--
2.41.0
- [PULL 12/26] tests/qtest: option to suspend during migration, (continued)
- [PULL 12/26] tests/qtest: option to suspend during migration, peterx, 2024/01/03
- [PULL 13/26] tests/qtest: precopy migration with suspend, peterx, 2024/01/03
- [PULL 14/26] tests/qtest: postcopy migration with suspend, peterx, 2024/01/03
- [PULL 15/26] migration: Remove migrate_max_downtime() declaration, peterx, 2024/01/03
- [PULL 17/26] migration: Refactor migration_incoming_setup(), peterx, 2024/01/03
- [PULL 16/26] migration: Remove nulling of hostname in migrate_init(), peterx, 2024/01/03
- [PULL 19/26] migration/multifd: Fix error message in multifd_recv_initial_packet(), peterx, 2024/01/03
- [PULL 18/26] migration: Remove errp parameter in migration_fd_process_incoming(), peterx, 2024/01/03
- [PULL 20/26] migration/multifd: Simplify multifd_channel_connect() if else statement, peterx, 2024/01/03
- [PULL 21/26] migration/multifd: Fix leaking of Error in TLS error flow, peterx, 2024/01/03
- [PULL 22/26] migration/multifd: Remove error_setg() in migration_ioc_process_incoming(),
peterx <=
- [PULL 23/26] migration: Fix migration_channel_read_peek() error path, peterx, 2024/01/03
- [PULL 25/26] migration/multifd: Remove unnecessary usage of local Error, peterx, 2024/01/03
- [PULL 24/26] migration: Remove unnecessary usage of local Error, peterx, 2024/01/03
- [PULL 26/26] migration: fix coverity migrate_mode finding, peterx, 2024/01/03
- Re: [PULL 00/26] Migration 20240104 patches, Peter Maydell, 2024/01/05