[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 18/26] migration: Remove errp parameter in migration_fd_process_in
From: |
peterx |
Subject: |
[PULL 18/26] migration: Remove errp parameter in migration_fd_process_incoming() |
Date: |
Thu, 4 Jan 2024 12:32:03 +0800 |
From: Avihai Horon <avihaih@nvidia.com>
Errp parameter in migration_fd_process_incoming() is unused.
Remove it.
Signed-off-by: Avihai Horon <avihaih@nvidia.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Link: https://lore.kernel.org/r/20231231093016.14204-5-avihaih@nvidia.com
Signed-off-by: Peter Xu <peterx@redhat.com>
---
migration/migration.h | 2 +-
migration/migration.c | 2 +-
migration/rdma.c | 6 +-----
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/migration/migration.h b/migration/migration.h
index b3c9288c38..17972dac34 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -474,7 +474,7 @@ struct MigrationState {
void migrate_set_state(int *state, int old_state, int new_state);
-void migration_fd_process_incoming(QEMUFile *f, Error **errp);
+void migration_fd_process_incoming(QEMUFile *f);
void migration_ioc_process_incoming(QIOChannel *ioc, Error **errp);
void migration_incoming_process(void);
diff --git a/migration/migration.c b/migration/migration.c
index e7d342ab59..8bb1a8134e 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -774,7 +774,7 @@ static bool postcopy_try_recover(void)
return false;
}
-void migration_fd_process_incoming(QEMUFile *f, Error **errp)
+void migration_fd_process_incoming(QEMUFile *f)
{
migration_incoming_setup(f);
if (postcopy_try_recover()) {
diff --git a/migration/rdma.c b/migration/rdma.c
index 04debab5d9..94c0f871f0 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -4035,7 +4035,6 @@ static void rdma_accept_incoming_migration(void *opaque)
{
RDMAContext *rdma = opaque;
QEMUFile *f;
- Error *local_err = NULL;
trace_qemu_rdma_accept_incoming_migration();
if (qemu_rdma_accept(rdma) < 0) {
@@ -4057,10 +4056,7 @@ static void rdma_accept_incoming_migration(void *opaque)
}
rdma->migration_started_on_destination = 1;
- migration_fd_process_incoming(f, &local_err);
- if (local_err) {
- error_reportf_err(local_err, "RDMA ERROR:");
- }
+ migration_fd_process_incoming(f);
}
void rdma_start_incoming_migration(InetSocketAddress *host_port,
--
2.41.0
- [PULL 09/26] migration: preserve suspended for snapshot, (continued)
- [PULL 09/26] migration: preserve suspended for snapshot, peterx, 2024/01/03
- [PULL 10/26] migration: preserve suspended for bg_migration, peterx, 2024/01/03
- [PULL 11/26] tests/qtest: migration events, peterx, 2024/01/03
- [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 <=
- [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, 2024/01/03
- [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