OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

migration: Refactor migration_incoming_setup()

Browse Source 
Commit 6720c2b327 ("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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Link: https://lore.kernel.org/r/20231231093016.14204-4-avihaih@nvidia.com
Signed-off-by: Peter Xu <peterx@redhat.com>
This commit is contained in:
Avihai Horon 2023-12-31 11:30:08 +02:00 committed by Peter Xu
parent 80caba6955
commit c606f3baa2
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
migration/migration.c
View File

@ -724,11 +724,8 @@ fail:
/** /**
* migration_incoming_setup: Setup incoming migration * migration_incoming_setup: Setup incoming migration
* @f: file for main migration channel * @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(); MigrationIncomingState *mis = migration_incoming_get_current();
@ -736,7 +733,6 @@ static bool migration_incoming_setup(QEMUFile *f, Error **errp)
mis->from_src_file = f; mis->from_src_file = f;
} }
qemu_file_set_blocking(f, false); qemu_file_set_blocking(f, false);
return true;
} }
void migration_incoming_process(void) void migration_incoming_process(void)
@ -780,9 +776,7 @@ static bool postcopy_try_recover(void)
void migration_fd_process_incoming(QEMUFile *f, Error **errp) void migration_fd_process_incoming(QEMUFile *f, Error **errp)
{ {
if (!migration_incoming_setup(f, errp)) { migration_incoming_setup(f);
return;
}
if (postcopy_try_recover()) { if (postcopy_try_recover()) {
return; return;
} }
@ -855,10 +849,7 @@ void migration_ioc_process_incoming(QIOChannel *ioc, Error **errp)
if (default_channel) { if (default_channel) {
f = qemu_file_new_input(ioc); f = qemu_file_new_input(ioc);
migration_incoming_setup(f);
if (!migration_incoming_setup(f, errp)) {
return;
}
} else { } else {
/* Multiple connections */ /* Multiple connections */
assert(migration_needs_multiple_sockets()); assert(migration_needs_multiple_sockets());