[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 13/43] migration: Create migrate_rdma_pin_all() function
From: |
Juan Quintela |
Subject: |
[PATCH v2 13/43] migration: Create migrate_rdma_pin_all() function |
Date: |
Thu, 20 Apr 2023 15:39:32 +0200 |
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
---
migration/options.c | 7 +++++++
migration/options.h | 1 +
migration/rdma.c | 6 +++---
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/migration/options.c b/migration/options.c
index 2003e413da..9c9b8e5863 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -138,6 +138,13 @@ bool migrate_postcopy_ram(void)
return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_RAM];
}
+bool migrate_rdma_pin_all(void)
+{
+ MigrationState *s = migrate_get_current();
+
+ return s->capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL];
+}
+
bool migrate_release_ram(void)
{
MigrationState *s;
diff --git a/migration/options.h b/migration/options.h
index 316efd1063..25c002b37a 100644
--- a/migration/options.h
+++ b/migration/options.h
@@ -30,6 +30,7 @@ bool migrate_pause_before_switchover(void);
bool migrate_postcopy_blocktime(void);
bool migrate_postcopy_preempt(void);
bool migrate_postcopy_ram(void);
+bool migrate_rdma_pin_all(void);
bool migrate_release_ram(void);
bool migrate_return_path(void);
bool migrate_validate_uuid(void);
diff --git a/migration/rdma.c b/migration/rdma.c
index bf55e2f163..3e7b68c482 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -35,6 +35,7 @@
#include <rdma/rdma_cma.h>
#include "trace.h"
#include "qom/object.h"
+#include "options.h"
#include <poll.h>
/*
@@ -4178,8 +4179,7 @@ void rdma_start_outgoing_migration(void *opaque,
goto err;
}
- ret = qemu_rdma_source_init(rdma,
- s->capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL], errp);
+ ret = qemu_rdma_source_init(rdma,migrate_rdma_pin_all(), errp);
if (ret) {
goto err;
@@ -4201,7 +4201,7 @@ void rdma_start_outgoing_migration(void *opaque,
}
ret = qemu_rdma_source_init(rdma_return_path,
- s->capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL], errp);
+ migrate_rdma_pin_all(), errp);
if (ret) {
goto return_path_err;
--
2.39.2
- [PATCH v2 05/43] migration: Move migrate_colo_enabled() to options.c, (continued)
- [PATCH v2 05/43] migration: Move migrate_colo_enabled() to options.c, Juan Quintela, 2023/04/20
- [PATCH v2 01/43] migration: move migration_global_dump() to migration-hmp-cmds.c, Juan Quintela, 2023/04/20
- [PATCH v2 06/43] migration: Move migrate_use_compression() to options.c, Juan Quintela, 2023/04/20
- [PATCH v2 04/43] migration: Create options.c, Juan Quintela, 2023/04/20
- [PATCH v2 07/43] migration: Move migrate_use_events() to options.c, Juan Quintela, 2023/04/20
- [PATCH v2 08/43] migration: Move migrate_use_multifd() to options.c, Juan Quintela, 2023/04/20
- [PATCH v2 09/43] migration: Move migrate_use_zero_copy_send() to options.c, Juan Quintela, 2023/04/20
- [PATCH v2 10/43] migration: Move migrate_use_xbzrle() to options.c, Juan Quintela, 2023/04/20
- [PATCH v2 11/43] migration: Move migrate_use_block() to options.c, Juan Quintela, 2023/04/20
- [PATCH v2 12/43] migration: Move migrate_use_return() to options.c, Juan Quintela, 2023/04/20
- [PATCH v2 13/43] migration: Create migrate_rdma_pin_all() function,
Juan Quintela <=
- [PATCH v2 14/43] migration: Move migrate_caps_check() to options.c, Juan Quintela, 2023/04/20
- [PATCH v2 15/43] migration: Move qmp_query_migrate_capabilities() to options.c, Juan Quintela, 2023/04/20
- [PATCH v2 16/43] migration: Move qmp_migrate_set_capabilities() to options.c, Juan Quintela, 2023/04/20
- [PATCH v2 17/43] migration: Move migrate_cap_set() to options.c, Juan Quintela, 2023/04/20
- [PATCH v2 18/43] migration: Move parameters functions to option.c, Juan Quintela, 2023/04/20