Re: [PATCH RFC 02/14] migration: judge whether or not the RDMA is used for migration

[Juan Quintela]

Zhimin Feng  wrote:
> Signed-off-by: Zhimin Feng 
> ---
>  migration/migration.c | 10 ++
>  migration/migration.h |  1 +
>  2 files changed, 11 insertions(+)
>
> diff --git a/migration/migration.c b/migration/migration.c
> index 10a13e0c79..819089a7ea 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -107,6 +107,7 @@ static NotifierList migration_state_notifiers =
>  NOTIFIER_LIST_INITIALIZER(migration_state_notifiers);
>  
>  static bool deferred_incoming;
> +static bool enabled_rdma_migration;

Please no.
Use a field in migration state.

No problem with the rest ofthe patch.

Later, Juan.

[PATCH RFC 02/14] migration: judge whether or not the RDMA is used for migration

[Zhimin Feng]

Signed-off-by: Zhimin Feng 
---
 migration/migration.c | 10 ++
 migration/migration.h |  1 +
 2 files changed, 11 insertions(+)

diff --git a/migration/migration.c b/migration/migration.c
index 10a13e0c79..819089a7ea 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -107,6 +107,7 @@ static NotifierList migration_state_notifiers =
 NOTIFIER_LIST_INITIALIZER(migration_state_notifiers);
 
 static bool deferred_incoming;
+static bool enabled_rdma_migration;
 
 /* Messages sent on the return path from destination to source */
 enum mig_rp_message_type {
@@ -354,6 +355,7 @@ void migrate_add_address(SocketAddress *address)
 void qemu_start_incoming_migration(const char *uri, Error **errp)
 {
 const char *p;
+enabled_rdma_migration = false;
 
 qapi_event_send_migration(MIGRATION_STATUS_SETUP);
 if (!strcmp(uri, "defer")) {
@@ -362,6 +364,7 @@ void qemu_start_incoming_migration(const char *uri, Error 
**errp)
 tcp_start_incoming_migration(p, errp);
 #ifdef CONFIG_RDMA
 } else if (strstart(uri, "rdma:", )) {
+enabled_rdma_migration = true;
 rdma_start_incoming_migration(p, errp);
 #endif
 } else if (strstart(uri, "exec:", )) {
@@ -1982,6 +1985,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
 Error *local_err = NULL;
 MigrationState *s = migrate_get_current();
 const char *p;
+enabled_rdma_migration = false;
 
 if (!migrate_prepare(s, has_blk && blk, has_inc && inc,
  has_resume && resume, errp)) {
@@ -1993,6 +1997,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
 tcp_start_outgoing_migration(s, p, _err);
 #ifdef CONFIG_RDMA
 } else if (strstart(uri, "rdma:", )) {
+enabled_rdma_migration = true;
 rdma_start_outgoing_migration(s, p, _err);
 #endif
 } else if (strstart(uri, "exec:", )) {
@@ -2208,6 +2213,11 @@ bool migrate_use_events(void)
 return s->enabled_capabilities[MIGRATION_CAPABILITY_EVENTS];
 }
 
+bool migrate_use_rdma(void)
+{
+return enabled_rdma_migration;
+}
+
 bool migrate_use_rdma_pin_all(void)
 {
 MigrationState *s;
diff --git a/migration/migration.h b/migration/migration.h
index 50fc2693c7..9b37320d50 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -297,6 +297,7 @@ bool migrate_ignore_shared(void);
 bool migrate_validate_uuid(void);
 
 bool migrate_auto_converge(void);
+bool migrate_use_rdma(void);
 bool migrate_use_rdma_pin_all(void);
 bool migrate_use_multifd(void);
 bool migrate_pause_before_switchover(void);
-- 
2.19.1