qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: Leonardo Bras <leobras@redhat.com>,
	Juan Quintela <quintela@redhat.com>, Peter Xu <peterx@redhat.com>
Subject: [PATCH v3 01/10] migration: Create migrate_rdma()
Date: Tue,  9 May 2023 14:06:51 +0200	[thread overview]
Message-ID: <20230509120700.78359-2-quintela@redhat.com> (raw)
In-Reply-To: <20230509120700.78359-1-quintela@redhat.com>

Helper to say if we are doing a migration over rdma.

Signed-off-by: Juan Quintela <quintela@redhat.com>

---

Cleanup rdma_migration in migration_prepare (danp)
---
 migration/migration.c | 1 +
 migration/migration.h | 3 +++
 migration/options.c   | 7 +++++++
 migration/options.h   | 1 +
 migration/rdma.c      | 4 +++-
 5 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/migration/migration.c b/migration/migration.c
index 0bf31068a7..cef694e3a9 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1410,6 +1410,7 @@ void migrate_init(MigrationState *s)
     s->vm_was_running = false;
     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/migration.h b/migration/migration.h
index 7f554455ac..22f7c8942e 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -431,6 +431,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.c b/migration/options.c
index a024fa3ce6..22def37ec4 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/options.h b/migration/options.h
index 5cca3326d6..ef545edf85 100644
--- a/migration/options.h
+++ b/migration/options.h
@@ -61,6 +61,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/rdma.c b/migration/rdma.c
index afdd359878..93a1b8b5ad 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -4123,6 +4123,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();
 
@@ -4153,7 +4154,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;
@@ -4229,6 +4230,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.0



  reply	other threads:[~2023-05-09 12:08 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-09 12:06 [PATCH v3 00/10] migration: Remove QEMUFileHooks Juan Quintela
2023-05-09 12:06 ` Juan Quintela [this message]
2023-05-09 12:06 ` [PATCH v3 02/10] migration/rdma: Unfold ram_control_before_iterate() Juan Quintela
2023-05-09 12:06 ` [PATCH v3 03/10] migration/rdma: Unfold ram_control_after_iterate() Juan Quintela
2023-05-09 12:06 ` [PATCH v3 04/10] migration/rdma: Remove all uses of RAM_CONTROL_HOOK Juan Quintela
2023-05-09 12:06 ` [PATCH v3 05/10] migration/rdma: Unfold hook_ram_load() Juan Quintela
2023-05-09 12:06 ` [PATCH v3 06/10] migration/rdma: Create rdma_control_save_page() Juan Quintela
2023-05-09 12:06 ` [PATCH v3 07/10] qemu-file: Remove QEMUFileHooks Juan Quintela
2023-05-09 12:06 ` [PATCH v3 08/10] migration/rdma: Move rdma constants from qemu-file.h to rdma.h Juan Quintela
2023-05-09 12:06 ` [PATCH v3 09/10] migration/rdma: Remove qemu_ prefix from exported functions Juan Quintela
2023-05-09 12:07 ` [PATCH v3 10/10] migration/rdma: Check sooner if we are in postcopy for save_page() Juan Quintela
2023-05-26 21:41 ` [PATCH v3 00/10] migration: Remove QEMUFileHooks Peter Xu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230509120700.78359-2-quintela@redhat.com \
    --to=quintela@redhat.com \
    --cc=leobras@redhat.com \
    --cc=peterx@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).