mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migration: Handle migration_incoming_setup() errors consistently

Browse Source 
Commit b673eab4e2 "multifd: Make multifd_load_setup() get an Error
parameter" changed migration_incoming_setup() to take an Error **
argument, and adjusted the callers accordingly.  It neglected to
change adjust multifd_load_setup(): it still exit()s on error.  Clean
that up.

The error now gets propagated up two call chains: via
migration_fd_process_incoming() to rdma_accept_incoming_migration(),
and via migration_ioc_process_incoming() to
migration_channel_process_incoming().  Both chain ends report the
error with error_report_err(), but otherwise ignore it.  Behavioral
change: we no longer exit() on this error.

This is consistent with how we handle other errors here, e.g. from
multifd_recv_new_channel() via migration_ioc_process_incoming() to
migration_channel_process_incoming().  Whether it's consistently right
or consistently wrong I can't tell.

Also clean up the return value from the unusual 0 on success, 1 on
error to the more common true on success, false on error.

Cc: Juan Quintela <quintela@redhat.com>
Cc: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210720125408.387910-11-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Pankaj Gupta <pankaj.gupta@ionos.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Markus Armbruster 2021-07-20 14:54:02 +02:00
parent 436c831a28
commit 7d6f6933aa
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
migration/migration.c
View File

@ -611,30 +611,25 @@ fail:
} }
/** /**
* @migration_incoming_setup: Setup incoming migration * migration_incoming_setup: Setup incoming migration
*
* Returns 0 for no error or 1 for error
*
* @f: file for main migration channel * @f: file for main migration channel
* @errp: where to put errors * @errp: where to put errors
*
* Returns: %true on success, %false on error.
*/ */
static int migration_incoming_setup(QEMUFile *f, Error **errp) static bool migration_incoming_setup(QEMUFile *f, Error **errp)
{ {
MigrationIncomingState *mis = migration_incoming_get_current(); MigrationIncomingState *mis = migration_incoming_get_current();
Error *local_err = NULL;
if (multifd_load_setup(&local_err) != 0) { if (multifd_load_setup(errp) != 0) {
/* We haven't been able to create multifd threads return false;
nothing better to do */
error_report_err(local_err);
exit(EXIT_FAILURE);
} }
if (!mis->from_src_file) { if (!mis->from_src_file) {
mis->from_src_file = f; mis->from_src_file = f;
} }
qemu_file_set_blocking(f, false); qemu_file_set_blocking(f, false);
return 0; return true;
} }
void migration_incoming_process(void) void migration_incoming_process(void)
@ -677,14 +672,11 @@ static bool postcopy_try_recover(QEMUFile *f)
void migration_fd_process_incoming(QEMUFile *f, Error **errp) void migration_fd_process_incoming(QEMUFile *f, Error **errp)
{ {
Error *local_err = NULL;
if (postcopy_try_recover(f)) { if (postcopy_try_recover(f)) {
return; return;
} }
if (migration_incoming_setup(f, &local_err)) { if (!migration_incoming_setup(f, errp)) {
error_propagate(errp, local_err);
return; return;
} }
migration_incoming_process(); migration_incoming_process();
@ -705,8 +697,7 @@ void migration_ioc_process_incoming(QIOChannel *ioc, Error **errp)
return; return;
} }
if (migration_incoming_setup(f, &local_err)) { if (!migration_incoming_setup(f, errp)) {
error_propagate(errp, local_err);
return; return;
} }