[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 05/10] migration: Make multifd_load_setup() get an Error param
From: |
Juan Quintela |
Subject: |
[PATCH v2 05/10] migration: Make multifd_load_setup() get an Error parameter |
Date: |
Wed, 18 Dec 2019 03:01:14 +0100 |
We need to change the full chain to pass the Error parameter.
Signed-off-by: Juan Quintela <address@hidden>
---
migration/migration.c | 10 +++++-----
migration/migration.h | 2 +-
migration/ram.c | 2 +-
migration/ram.h | 2 +-
migration/rdma.c | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 5a56bd0c91..cf6cec5fb6 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -518,11 +518,11 @@ fail:
exit(EXIT_FAILURE);
}
-static void migration_incoming_setup(QEMUFile *f)
+static void migration_incoming_setup(QEMUFile *f, Error **errp)
{
MigrationIncomingState *mis = migration_incoming_get_current();
- if (multifd_load_setup() != 0) {
+ if (multifd_load_setup(errp) != 0) {
/* We haven't been able to create multifd threads
nothing better to do */
exit(EXIT_FAILURE);
@@ -572,13 +572,13 @@ static bool postcopy_try_recover(QEMUFile *f)
return false;
}
-void migration_fd_process_incoming(QEMUFile *f)
+void migration_fd_process_incoming(QEMUFile *f, Error **errp)
{
if (postcopy_try_recover(f)) {
return;
}
- migration_incoming_setup(f);
+ migration_incoming_setup(f, errp);
migration_incoming_process();
}
@@ -596,7 +596,7 @@ void migration_ioc_process_incoming(QIOChannel *ioc, Error
**errp)
return;
}
- migration_incoming_setup(f);
+ migration_incoming_setup(f, errp);
/*
* Common migration only needs one channel, so we can start
diff --git a/migration/migration.h b/migration/migration.h
index 79b3dda146..545f283ae7 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -265,7 +265,7 @@ struct MigrationState
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_incoming_process(void);
diff --git a/migration/ram.c b/migration/ram.c
index 1f364cc23d..fcf50e648a 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1421,7 +1421,7 @@ static void *multifd_recv_thread(void *opaque)
return NULL;
}
-int multifd_load_setup(void)
+int multifd_load_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 da22a417ea..42be471d52 100644
--- a/migration/ram.h
+++ b/migration/ram.h
@@ -43,7 +43,7 @@ uint64_t ram_bytes_total(void);
int multifd_save_setup(Error **errp);
void multifd_save_cleanup(void);
-int multifd_load_setup(void);
+int multifd_load_setup(Error **errp);
int multifd_load_cleanup(Error **errp);
bool multifd_recv_all_channels_created(void);
bool multifd_recv_new_channel(QIOChannel *ioc, Error **errp);
diff --git a/migration/rdma.c b/migration/rdma.c
index e241dcb992..2379b8345b 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -4004,7 +4004,7 @@ static void rdma_accept_incoming_migration(void *opaque)
}
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)
--
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 <=
- [PATCH v2 04/10] migration: Make multifd_save_setup() get an Error parameter, Juan Quintela, 2019/12/17
- [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