[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/21] migration: Create migrate_rdma()
|
From: |
Juan Quintela |
|
Subject: |
[PULL 12/21] migration: Create migrate_rdma() |
|
Date: |
Tue, 30 May 2023 20:25:22 +0200 |
Helper to say if we are doing a migration over rdma.
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20230509120700.78359-2-quintela@redhat.com>
---
migration/migration.h | 3 +++
migration/options.h | 1 +
migration/migration.c | 1 +
migration/options.c | 7 +++++++
migration/rdma.c | 4 +++-
5 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/migration/migration.h b/migration/migration.h
index 30c3e97635..7359572012 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -440,6 +440,9 @@ struct MigrationState {
/* QEMU_VM_VMDESCRIPTION content filled for all non-iterable devices. */
JSONWriter *vmdesc;
+
+ /* Is this a rdma migration */
+ bool rdma_migration;
};
void migrate_set_state(int *state, int old_state, int new_state);
diff --git a/migration/options.h b/migration/options.h
index 45991af3c2..33a6bae93c 100644
--- a/migration/options.h
+++ b/migration/options.h
@@ -54,6 +54,7 @@ bool migrate_zero_copy_send(void);
bool migrate_multifd_flush_after_each_section(void);
bool migrate_postcopy(void);
+bool migrate_rdma(void);
bool migrate_tls(void);
/* capabilities helpers */
diff --git a/migration/migration.c b/migration/migration.c
index 7c3425c6fe..31d30a2ac5 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1405,6 +1405,7 @@ void migrate_init(MigrationState *s)
s->vm_old_state = -1;
s->iteration_initial_bytes = 0;
s->threshold_size = 0;
+ s->rdma_migration = false;
}
int migrate_add_blocker_internal(Error *reason, Error **errp)
diff --git a/migration/options.c b/migration/options.c
index b62ab30cd5..4b99811197 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -350,6 +350,13 @@ bool migrate_postcopy(void)
return migrate_postcopy_ram() || migrate_dirty_bitmaps();
}
+bool migrate_rdma(void)
+{
+ MigrationState *s = migrate_get_current();
+
+ return s->rdma_migration;
+}
+
bool migrate_tls(void)
{
MigrationState *s = migrate_get_current();
diff --git a/migration/rdma.c b/migration/rdma.c
index 12d3c23fdc..c11863e614 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -4122,6 +4122,7 @@ void rdma_start_incoming_migration(const char *host_port,
Error **errp)
int ret;
RDMAContext *rdma;
Error *local_err = NULL;
+ MigrationState *s = migrate_get_current();
trace_rdma_start_incoming_migration();
@@ -4152,7 +4153,7 @@ void rdma_start_incoming_migration(const char *host_port,
Error **errp)
}
trace_rdma_start_incoming_migration_after_rdma_listen();
-
+ s->rdma_migration = true;
qemu_set_fd_handler(rdma->channel->fd, rdma_accept_incoming_migration,
NULL, (void *)(intptr_t)rdma);
return;
@@ -4228,6 +4229,7 @@ void rdma_start_outgoing_migration(void *opaque,
trace_rdma_start_outgoing_migration_after_rdma_connect();
+ s->rdma_migration = true;
s->to_dst_file = qemu_fopen_rdma(rdma, "wb");
migrate_fd_connect(s, NULL);
return;
--
2.40.1
- [PULL 03/21] runstate: drop unused runstate_store(), (continued)
- [PULL 03/21] runstate: drop unused runstate_store(), Juan Quintela, 2023/05/30
- [PULL 06/21] migration: Don't abuse qemu_file transferred for RDMA, Juan Quintela, 2023/05/30
- [PULL 05/21] migration: restore vmstate on migration failure, Juan Quintela, 2023/05/30
- [PULL 10/21] migration: Remove unused qemu_file_credit_transfer(), Juan Quintela, 2023/05/30
- [PULL 02/21] migration: never fail in global_state_store(), Juan Quintela, 2023/05/30
- [PULL 01/21] runstate: add runstate_get(), Juan Quintela, 2023/05/30
- [PULL 04/21] migration: switch from .vm_was_running to .vm_old_state, Juan Quintela, 2023/05/30
- [PULL 07/21] migration/RDMA: It is accounting for zero/normal pages in two places, Juan Quintela, 2023/05/30
- [PULL 08/21] migration/rdma: Remove QEMUFile parameter when not used, Juan Quintela, 2023/05/30
- [PULL 11/21] migration/rdma: Simplify the function that saves a page, Juan Quintela, 2023/05/30
- [PULL 12/21] migration: Create migrate_rdma(),
Juan Quintela <=
- [PULL 14/21] migration/rdma: Unfold ram_control_after_iterate(), Juan Quintela, 2023/05/30
- [PULL 15/21] migration/rdma: Remove all uses of RAM_CONTROL_HOOK, Juan Quintela, 2023/05/30
- [PULL 13/21] migration/rdma: Unfold ram_control_before_iterate(), Juan Quintela, 2023/05/30
- [PULL 09/21] migration/rdma: Don't use imaginary transfers, Juan Quintela, 2023/05/30
- [PULL 18/21] qemu-file: Remove QEMUFileHooks, Juan Quintela, 2023/05/30
- [PULL 17/21] migration/rdma: Create rdma_control_save_page(), Juan Quintela, 2023/05/30
- [PULL 21/21] migration/rdma: Check sooner if we are in postcopy for save_page(), Juan Quintela, 2023/05/30
- [PULL 19/21] migration/rdma: Move rdma constants from qemu-file.h to rdma.h, Juan Quintela, 2023/05/30
- [PULL 20/21] migration/rdma: Remove qemu_ prefix from exported functions, Juan Quintela, 2023/05/30
- [PULL 16/21] migration/rdma: Unfold hook_ram_load(), Juan Quintela, 2023/05/30