[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 14/18] multifd: Make multifd_save_setup() get an Error parameter
From: |
Juan Quintela |
Subject: |
[PULL 14/18] multifd: Make multifd_save_setup() get an Error parameter |
Date: |
Wed, 29 Jan 2020 12:15:32 +0100 |
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
---
migration/migration.c | 4 +++-
migration/ram.c | 2 +-
migration/ram.h | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 77768fb2c7..d478f832ea 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -3367,6 +3367,7 @@ static void *migration_thread(void *opaque)
void migrate_fd_connect(MigrationState *s, Error *error_in)
{
+ Error *local_err = NULL;
int64_t rate_limit;
bool resume = s->state == MIGRATION_STATUS_POSTCOPY_PAUSED;
@@ -3415,7 +3416,8 @@ void migrate_fd_connect(MigrationState *s, Error
*error_in)
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,
MIGRATION_STATUS_FAILED);
migrate_fd_cleanup(s);
diff --git a/migration/ram.c b/migration/ram.c
index 12b76b7841..78483247ad 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -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;
uint32_t page_count = MULTIFD_PACKET_SIZE / qemu_target_page_size();
diff --git a/migration/ram.h b/migration/ram.h
index bd0eee79b6..da22a417ea 100644
--- a/migration/ram.h
+++ b/migration/ram.h
@@ -41,7 +41,7 @@ int xbzrle_cache_resize(int64_t new_size, Error **errp);
uint64_t ram_bytes_remaining(void);
uint64_t ram_bytes_total(void);
-int multifd_save_setup(void);
+int multifd_save_setup(Error **errp);
void multifd_save_cleanup(void);
int multifd_load_setup(void);
int multifd_load_cleanup(Error **errp);
--
2.24.1
- [PULL 01/18] migration-test: Use g_free() instead of free(), (continued)
- [PULL 01/18] migration-test: Use g_free() instead of free(), Juan Quintela, 2020/01/29
- [PULL 02/18] multifd: Make sure that we don't do any IO after an error, Juan Quintela, 2020/01/29
- [PULL 03/18] qemu-file: Don't do IO after shutdown, Juan Quintela, 2020/01/29
- [PULL 04/18] migration: Don't send data if we have stopped, Juan Quintela, 2020/01/29
- [PULL 05/18] migration-test: Make sure that multifd and cancel works, Juan Quintela, 2020/01/29
- [PULL 06/18] migration: Create migration_is_running(), Juan Quintela, 2020/01/29
- [PULL 11/18] multifd: multifd_send_sync_main only needs the qemufile, Juan Quintela, 2020/01/29
- [PULL 10/18] multifd: multifd_queue_page only needs the qemufile, Juan Quintela, 2020/01/29
- [PULL 09/18] multifd: multifd_send_pages only needs the qemufile, Juan Quintela, 2020/01/29
- [PULL 15/18] multifd: Make multifd_load_setup() get an Error parameter, Juan Quintela, 2020/01/29
- [PULL 14/18] multifd: Make multifd_save_setup() get an Error parameter,
Juan Quintela <=
- [PULL 12/18] multifd: Use qemu_target_page_size(), Juan Quintela, 2020/01/29
- [PULL 13/18] migration: Make checkpatch happy with comments, Juan Quintela, 2020/01/29
- [PULL 17/18] migration: Simplify get_qlist, Juan Quintela, 2020/01/29
- [PULL 18/18] migration/compress: compress QEMUFile is not writable, Juan Quintela, 2020/01/29
- [PULL 07/18] migration/multifd: fix nullptr access in multifd_send_terminate_threads, Juan Quintela, 2020/01/29
- [PULL 08/18] ram_addr: Split RAMBlock definition, Juan Quintela, 2020/01/29
- [PULL 16/18] multifd: Split multifd code into its own file, Juan Quintela, 2020/01/29
- Re: [PULL 00/18] Pull migration patches, Peter Maydell, 2020/01/30