[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/30] migration: Move migrate_use_return() to options.c
From: |
Juan Quintela |
Subject: |
[PULL 13/30] migration: Move migrate_use_return() to options.c |
Date: |
Mon, 24 Apr 2023 15:27:13 +0200 |
Once that we are there, we rename the function to migrate_return_path()
to be consistent with all other capabilities.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
---
migration/migration.c | 11 +----------
migration/migration.h | 1 -
migration/options.c | 9 +++++++++
migration/options.h | 1 +
migration/rdma.c | 6 +++---
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 1f8ba94fc4..b03c4aa650 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2622,15 +2622,6 @@ static int64_t migrate_max_postcopy_bandwidth(void)
return s->parameters.max_postcopy_bandwidth;
}
-bool migrate_use_return_path(void)
-{
- MigrationState *s;
-
- s = migrate_get_current();
-
- return s->capabilities[MIGRATION_CAPABILITY_RETURN_PATH];
-}
-
bool migrate_use_block_incremental(void)
{
MigrationState *s;
@@ -4171,7 +4162,7 @@ void migrate_fd_connect(MigrationState *s, Error
*error_in)
* precopy, only if user specified "return-path" capability would
* QEMU uses the return path.
*/
- if (migrate_postcopy_ram() || migrate_use_return_path()) {
+ if (migrate_postcopy_ram() || migrate_return_path()) {
if (open_return_path_on_source(s, !resume)) {
error_report("Unable to open return-path for postcopy");
migrate_set_state(&s->state, s->state, MIGRATION_STATUS_FAILED);
diff --git a/migration/migration.h b/migration/migration.h
index d4b68b08a5..24184622a8 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -459,7 +459,6 @@ uint64_t migrate_xbzrle_cache_size(void);
bool migrate_use_block_incremental(void);
int migrate_max_cpu_throttle(void);
-bool migrate_use_return_path(void);
uint64_t ram_get_total_transferred_pages(void);
diff --git a/migration/options.c b/migration/options.c
index fe1eadeed6..2003e413da 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -147,6 +147,15 @@ bool migrate_release_ram(void)
return s->capabilities[MIGRATION_CAPABILITY_RELEASE_RAM];
}
+bool migrate_return_path(void)
+{
+ MigrationState *s;
+
+ s = migrate_get_current();
+
+ return s->capabilities[MIGRATION_CAPABILITY_RETURN_PATH];
+}
+
bool migrate_validate_uuid(void)
{
MigrationState *s;
diff --git a/migration/options.h b/migration/options.h
index e985a5233e..316efd1063 100644
--- a/migration/options.h
+++ b/migration/options.h
@@ -31,6 +31,7 @@ bool migrate_postcopy_blocktime(void);
bool migrate_postcopy_preempt(void);
bool migrate_postcopy_ram(void);
bool migrate_release_ram(void);
+bool migrate_return_path(void);
bool migrate_validate_uuid(void);
bool migrate_xbzrle(void);
bool migrate_zero_blocks(void);
diff --git a/migration/rdma.c b/migration/rdma.c
index f35f021963..bf55e2f163 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -3373,7 +3373,7 @@ static int qemu_rdma_accept(RDMAContext *rdma)
* initialize the RDMAContext for return path for postcopy after first
* connection request reached.
*/
- if ((migrate_postcopy() || migrate_use_return_path())
+ if ((migrate_postcopy() || migrate_return_path())
&& !rdma->is_return_path) {
rdma_return_path = qemu_rdma_data_init(rdma->host_port, NULL);
if (rdma_return_path == NULL) {
@@ -3456,7 +3456,7 @@ static int qemu_rdma_accept(RDMAContext *rdma)
}
/* Accept the second connection request for return path */
- if ((migrate_postcopy() || migrate_use_return_path())
+ if ((migrate_postcopy() || migrate_return_path())
&& !rdma->is_return_path) {
qemu_set_fd_handler(rdma->channel->fd, rdma_accept_incoming_migration,
NULL,
@@ -4193,7 +4193,7 @@ void rdma_start_outgoing_migration(void *opaque,
}
/* RDMA postcopy need a separate queue pair for return path */
- if (migrate_postcopy() || migrate_use_return_path()) {
+ if (migrate_postcopy() || migrate_return_path()) {
rdma_return_path = qemu_rdma_data_init(host_port, errp);
if (rdma_return_path == NULL) {
--
2.39.2
- [PULL 04/30] migration: Create migrate_cap_set(), (continued)
- [PULL 04/30] migration: Create migrate_cap_set(), Juan Quintela, 2023/04/24
- [PULL 01/30] migration: Minor control flow simplification, Juan Quintela, 2023/04/24
- [PULL 05/30] migration: Create options.c, Juan Quintela, 2023/04/24
- [PULL 09/30] migration: Move migrate_use_multifd() to options.c, Juan Quintela, 2023/04/24
- [PULL 02/30] migration: move migration_global_dump() to migration-hmp-cmds.c, Juan Quintela, 2023/04/24
- [PULL 03/30] spice: move client_migrate_info command to ui/, Juan Quintela, 2023/04/24
- [PULL 10/30] migration: Move migrate_use_zero_copy_send() to options.c, Juan Quintela, 2023/04/24
- [PULL 12/30] migration: Move migrate_use_block() to options.c, Juan Quintela, 2023/04/24
- [PULL 06/30] migration: Move migrate_colo_enabled() to options.c, Juan Quintela, 2023/04/24
- [PULL 07/30] migration: Move migrate_use_compression() to options.c, Juan Quintela, 2023/04/24
- [PULL 13/30] migration: Move migrate_use_return() to options.c,
Juan Quintela <=
- [PULL 11/30] migration: Move migrate_use_xbzrle() to options.c, Juan Quintela, 2023/04/24
- [PULL 14/30] migration: Create migrate_rdma_pin_all() function, Juan Quintela, 2023/04/24
- [PULL 17/30] migration: Move qmp_migrate_set_capabilities() to options.c, Juan Quintela, 2023/04/24
- [PULL 20/30] migration: Use migrate_max_postcopy_bandwidth(), Juan Quintela, 2023/04/24
- [PULL 15/30] migration: Move migrate_caps_check() to options.c, Juan Quintela, 2023/04/24
- [PULL 08/30] migration: Move migrate_use_events() to options.c, Juan Quintela, 2023/04/24
- [PULL 22/30] migration: Create migrate_throttle_trigger_threshold(), Juan Quintela, 2023/04/24
- [PULL 25/30] migration: Move migrate_announce_params() to option.c, Juan Quintela, 2023/04/24
- [PULL 24/30] migration: Create migrate_max_cpu_throttle(), Juan Quintela, 2023/04/24
- [PULL 26/30] migration: Create migrate_cpu_throttle_initial() to option.c, Juan Quintela, 2023/04/24