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

multifd: Make multifd_save_setup() get an Error parameter

Browse Source 
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:33:27 +02:00
parent 857a4bbb86
commit 00f4b572e6
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
migration/migration.c
View File

@ -3367,6 +3367,7 @@ static void *migration_thread(void *opaque)
void migrate_fd_connect(MigrationState *s, Error *error_in) void migrate_fd_connect(MigrationState *s, Error *error_in)
{ {
Error *local_err = NULL;
int64_t rate_limit; int64_t rate_limit;
bool resume = s->state == MIGRATION_STATUS_POSTCOPY_PAUSED; bool resume = s->state == MIGRATION_STATUS_POSTCOPY_PAUSED;
@ -3415,7 +3416,8 @@ void migrate_fd_connect(MigrationState *s, Error *error_in)
return; return;
} }
if (multifd_save_setup() != 0) { if (multifd_save_setup(&local_err) != 0) {
error_report_err(local_err);
migrate_set_state(&s->state, MIGRATION_STATUS_SETUP, migrate_set_state(&s->state, MIGRATION_STATUS_SETUP,
MIGRATION_STATUS_FAILED); MIGRATION_STATUS_FAILED);
migrate_fd_cleanup(s); migrate_fd_cleanup(s);

2
migration/ram.c
View File

@ -1252,7 +1252,7 @@ static void multifd_new_send_channel_async(QIOTask *task, gpointer opaque)
} }
} }
int multifd_save_setup(void) int multifd_save_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();

2
migration/ram.h
View File

@ -41,7 +41,7 @@ int xbzrle_cache_resize(int64_t new_size, Error **errp);
uint64_t ram_bytes_remaining(void); uint64_t ram_bytes_remaining(void);
uint64_t ram_bytes_total(void); uint64_t ram_bytes_total(void);
int multifd_save_setup(void); 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(void);
int multifd_load_cleanup(Error **errp); int multifd_load_cleanup(Error **errp);