multifd: Make multifd_load_setup() get an Error parameter

We need to change the full chain to pass the Error parameter.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Juan Quintela 2019-06-12 11:44:19 +02:00
parent 00f4b572e6
commit b673eab4e2
5 changed files with 33 additions and 10 deletions

View File

@ -518,13 +518,23 @@ fail:
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
static void migration_incoming_setup(QEMUFile *f) /**
* @migration_incoming_setup: Setup incoming migration
*
* Returns 0 for no error or 1 for error
*
* @f: file for main migration channel
* @errp: where to put errors
*/
static int 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() != 0) { if (multifd_load_setup(&local_err) != 0) {
/* We haven't been able to create multifd threads /* We haven't been able to create multifd threads
nothing better to do */ nothing better to do */
error_report_err(local_err);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
@ -532,6 +542,7 @@ static void migration_incoming_setup(QEMUFile *f)
mis->from_src_file = f; mis->from_src_file = f;
} }
qemu_file_set_blocking(f, false); qemu_file_set_blocking(f, false);
return 0;
} }
void migration_incoming_process(void) void migration_incoming_process(void)
@ -572,19 +583,27 @@ static bool postcopy_try_recover(QEMUFile *f)
return false; return false;
} }
void migration_fd_process_incoming(QEMUFile *f) 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;
} }
migration_incoming_setup(f); if (migration_incoming_setup(f, &local_err)) {
if (local_err) {
error_propagate(errp, local_err);
}
return;
}
migration_incoming_process(); migration_incoming_process();
} }
void migration_ioc_process_incoming(QIOChannel *ioc, Error **errp) void migration_ioc_process_incoming(QIOChannel *ioc, Error **errp)
{ {
MigrationIncomingState *mis = migration_incoming_get_current(); MigrationIncomingState *mis = migration_incoming_get_current();
Error *local_err = NULL;
bool start_migration; bool start_migration;
if (!mis->from_src_file) { if (!mis->from_src_file) {
@ -596,7 +615,12 @@ void migration_ioc_process_incoming(QIOChannel *ioc, Error **errp)
return; return;
} }
migration_incoming_setup(f); if (migration_incoming_setup(f, &local_err)) {
if (local_err) {
error_propagate(errp, local_err);
}
return;
}
/* /*
* Common migration only needs one channel, so we can start * Common migration only needs one channel, so we can start
@ -604,7 +628,6 @@ void migration_ioc_process_incoming(QIOChannel *ioc, Error **errp)
*/ */
start_migration = !migrate_use_multifd(); start_migration = !migrate_use_multifd();
} else { } else {
Error *local_err = NULL;
/* Multiple connections */ /* Multiple connections */
assert(migrate_use_multifd()); assert(migrate_use_multifd());
start_migration = multifd_recv_new_channel(ioc, &local_err); start_migration = multifd_recv_new_channel(ioc, &local_err);

View File

@ -265,7 +265,7 @@ struct MigrationState
void migrate_set_state(int *state, int old_state, int new_state); void migrate_set_state(int *state, int old_state, int new_state);
void migration_fd_process_incoming(QEMUFile *f); void migration_fd_process_incoming(QEMUFile *f, Error **errp);
void migration_ioc_process_incoming(QIOChannel *ioc, Error **errp); void migration_ioc_process_incoming(QIOChannel *ioc, Error **errp);
void migration_incoming_process(void); void migration_incoming_process(void);

View File

@ -1474,7 +1474,7 @@ static void *multifd_recv_thread(void *opaque)
return NULL; return NULL;
} }
int multifd_load_setup(void) int multifd_load_setup(Error **errp)
{ {
int thread_count; int thread_count;
uint32_t page_count = MULTIFD_PACKET_SIZE / qemu_target_page_size(); uint32_t page_count = MULTIFD_PACKET_SIZE / qemu_target_page_size();

View File

@ -43,7 +43,7 @@ uint64_t ram_bytes_total(void);
int multifd_save_setup(Error **errp); int multifd_save_setup(Error **errp);
void multifd_save_cleanup(void); void multifd_save_cleanup(void);
int multifd_load_setup(void); int multifd_load_setup(Error **errp);
int multifd_load_cleanup(Error **errp); int multifd_load_cleanup(Error **errp);
bool multifd_recv_all_channels_created(void); bool multifd_recv_all_channels_created(void);
bool multifd_recv_new_channel(QIOChannel *ioc, Error **errp); bool multifd_recv_new_channel(QIOChannel *ioc, Error **errp);

View File

@ -4004,7 +4004,7 @@ static void rdma_accept_incoming_migration(void *opaque)
} }
rdma->migration_started_on_destination = 1; rdma->migration_started_on_destination = 1;
migration_fd_process_incoming(f); migration_fd_process_incoming(f, errp);
} }
void rdma_start_incoming_migration(const char *host_port, Error **errp) void rdma_start_incoming_migration(const char *host_port, Error **errp)