| Message ID | 20231231093016.14204-4-avihaih@nvidia.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | migration: Misc cleanups and fixes | expand |
On 31/12/23 10:30, Avihai Horon wrote: > Commit 6720c2b32725 ("migration: check magic value for deciding the > mapping of channels") extracted the only code that could fail in > migration_incoming_setup(). > > Now migration_incoming_setup() can't fail, so refactor it to return void > and remove errp parameter. > > Signed-off-by: Avihai Horon <avihaih@nvidia.com> > --- > migration/migration.c | 15 +++------------ > 1 file changed, 3 insertions(+), 12 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Avihai Horon <avihaih@nvidia.com> writes: > Commit 6720c2b32725 ("migration: check magic value for deciding the > mapping of channels") extracted the only code that could fail in > migration_incoming_setup(). > > Now migration_incoming_setup() can't fail, so refactor it to return void > and remove errp parameter. > > Signed-off-by: Avihai Horon <avihaih@nvidia.com> Reviewed-by: Fabiano Rosas <farosas@suse.de>
diff --git a/migration/migration.c b/migration/migration.c index 1e25d7966f..55d77572d8 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -724,11 +724,8 @@ fail: /** * migration_incoming_setup: Setup incoming migration * @f: file for main migration channel - * @errp: where to put errors - * - * Returns: %true on success, %false on error. */ -static bool migration_incoming_setup(QEMUFile *f, Error **errp) +static void migration_incoming_setup(QEMUFile *f) { MigrationIncomingState *mis = migration_incoming_get_current(); @@ -736,7 +733,6 @@ static bool migration_incoming_setup(QEMUFile *f, Error **errp) mis->from_src_file = f; } qemu_file_set_blocking(f, false); - return true; } void migration_incoming_process(void) @@ -780,9 +776,7 @@ static bool postcopy_try_recover(void) void migration_fd_process_incoming(QEMUFile *f, Error **errp) { - if (!migration_incoming_setup(f, errp)) { - return; - } + migration_incoming_setup(f); if (postcopy_try_recover()) { return; } @@ -855,10 +849,7 @@ void migration_ioc_process_incoming(QIOChannel *ioc, Error **errp) if (default_channel) { f = qemu_file_new_input(ioc); - - if (!migration_incoming_setup(f, errp)) { - return; - } + migration_incoming_setup(f); } else { /* Multiple connections */ assert(migration_needs_multiple_sockets());
Commit 6720c2b32725 ("migration: check magic value for deciding the mapping of channels") extracted the only code that could fail in migration_incoming_setup(). Now migration_incoming_setup() can't fail, so refactor it to return void and remove errp parameter. Signed-off-by: Avihai Horon <avihaih@nvidia.com> --- migration/migration.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-)