[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 04/10] migration: Make multifd_save_setup() get an Error param
From: |
Juan Quintela |
Subject: |
[PATCH v2 04/10] migration: Make multifd_save_setup() get an Error parameter |
Date: |
Wed, 18 Dec 2019 03:01:13 +0100 |
Signed-off-by: Juan Quintela <address@hidden>
---
migration/migration.c | 2 +-
migration/ram.c | 2 +-
migration/ram.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index e7f707e033..5a56bd0c91 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -3400,7 +3400,7 @@ void migrate_fd_connect(MigrationState *s, Error
*error_in)
return;
}
- if (multifd_save_setup() != 0) {
+ if (multifd_save_setup(&error_in) != 0) {
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 38070f1bb2..1f364cc23d 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1208,7 +1208,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.23.0
- [PATCH v2 00/10] Multifd Migration Compression, Juan Quintela, 2019/12/17
- [PATCH v2 02/10] migration-test: Add migration multifd test, Juan Quintela, 2019/12/17
- [PATCH v2 01/10] migration: Increase default number of multifd channels to 16, Juan Quintela, 2019/12/17
- [PATCH v2 03/10] migration-test: introduce functions to handle string parameters, Juan Quintela, 2019/12/17
- [PATCH v2 05/10] migration: Make multifd_load_setup() get an Error parameter, Juan Quintela, 2019/12/17
- [PATCH v2 04/10] migration: Make multifd_save_setup() get an Error parameter,
Juan Quintela <=
- [PATCH v2 07/10] migration: Make no compression operations into its own structure, Juan Quintela, 2019/12/17
- [PATCH v2 06/10] migration: Add multifd-compress parameter, Juan Quintela, 2019/12/17
- [PATCH v2 08/10] migration: Add zlib compression multifd support, Juan Quintela, 2019/12/17
- [PATCH v2 09/10] configure: Enable test and libs for zstd, Juan Quintela, 2019/12/17
- [PATCH v2 10/10] migration: Add zstd compression multifd support, Juan Quintela, 2019/12/17