From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: Fabiano Rosas <farosas@suse.de>, Peter Xu <peterx@redhat.com>,
Juan Quintela <quintela@redhat.com>,
Leonardo Bras <leobras@redhat.com>,
Li Zhijian <lizhijian@fujitsu.com>
Subject: [PATCH v3 10/13] migration/rdma: Check sooner if we are in postcopy for save_page()
Date: Wed, 11 Oct 2023 22:35:24 +0200 [thread overview]
Message-ID: <20231011203527.9061-11-quintela@redhat.com> (raw)
In-Reply-To: <20231011203527.9061-1-quintela@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/rdma.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/migration/rdma.c b/migration/rdma.c
index d3bba05262..932d4eda9b 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -3240,10 +3240,6 @@ static int qemu_rdma_save_page(QEMUFile *f, ram_addr_t block_offset,
RDMAContext *rdma;
int ret;
- if (migration_in_postcopy()) {
- return RAM_SAVE_CONTROL_NOT_SUPP;
- }
-
RCU_READ_LOCK_GUARD();
rdma = qatomic_rcu_read(&rioc->rdmaout);
@@ -3317,7 +3313,7 @@ err:
int rdma_control_save_page(QEMUFile *f, ram_addr_t block_offset,
ram_addr_t offset, size_t size)
{
- if (!migrate_rdma()) {
+ if (!migrate_rdma() || migration_in_postcopy()) {
return RAM_SAVE_CONTROL_NOT_SUPP;
}
--
2.41.0
next prev parent reply other threads:[~2023-10-11 20:36 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-11 20:35 [PATCH v3 00/13] Removal of QEMUFileHooks Juan Quintela
2023-10-11 20:35 ` [PATCH v3 01/13] migration: Create migrate_rdma() Juan Quintela
2023-10-13 7:58 ` Zhijian Li (Fujitsu)
2023-10-11 20:35 ` [PATCH v3 02/13] migration/rdma: Unfold ram_control_before_iterate() Juan Quintela
2023-10-12 14:21 ` Fabiano Rosas
2023-10-13 8:24 ` Zhijian Li (Fujitsu)
2023-10-11 20:35 ` [PATCH v3 03/13] migration/rdma: Unfold ram_control_after_iterate() Juan Quintela
2023-10-13 7:59 ` Zhijian Li (Fujitsu)
2023-10-11 20:35 ` [PATCH v3 04/13] migration/rdma: Remove all uses of RAM_CONTROL_HOOK Juan Quintela
2023-10-13 8:00 ` Zhijian Li (Fujitsu)
2023-10-11 20:35 ` [PATCH v3 05/13] migration/rdma: Unfold hook_ram_load() Juan Quintela
2023-10-13 8:02 ` Zhijian Li (Fujitsu)
2023-10-11 20:35 ` [PATCH v3 06/13] migration/rdma: Create rdma_control_save_page() Juan Quintela
2023-10-13 8:05 ` Zhijian Li (Fujitsu)
2023-10-11 20:35 ` [PATCH v3 07/13] qemu-file: Remove QEMUFileHooks Juan Quintela
2023-10-13 8:07 ` Zhijian Li (Fujitsu)
2023-10-11 20:35 ` [PATCH v3 08/13] migration/rdma: Move rdma constants from qemu-file.h to rdma.h Juan Quintela
2023-10-13 8:08 ` Zhijian Li (Fujitsu)
2023-10-11 20:35 ` [PATCH v3 09/13] migration/rdma: Remove qemu_ prefix from exported functions Juan Quintela
2023-10-13 8:09 ` Zhijian Li (Fujitsu)
2023-10-11 20:35 ` Juan Quintela [this message]
2023-10-13 8:11 ` [PATCH v3 10/13] migration/rdma: Check sooner if we are in postcopy for save_page() Zhijian Li (Fujitsu)
2023-10-11 20:35 ` [PATCH v3 11/13] migration/rdma: Use i as for index instead of idx Juan Quintela
2023-10-12 14:30 ` Fabiano Rosas
2023-10-13 8:13 ` Zhijian Li (Fujitsu)
2023-10-11 20:35 ` [PATCH v3 12/13] migration/rdma: Declare for index variables local Juan Quintela
2023-10-12 14:33 ` Fabiano Rosas
2023-10-13 8:17 ` Zhijian Li (Fujitsu)
2023-10-11 20:35 ` [PATCH v3 13/13] migration/rdma: Remove all "ret" variables that are used only once Juan Quintela
2023-10-12 14:44 ` Fabiano Rosas
2023-10-16 6:36 ` Juan Quintela
2023-10-13 8:19 ` Zhijian Li (Fujitsu)
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=20231011203527.9061-11-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=farosas@suse.de \
--cc=leobras@redhat.com \
--cc=lizhijian@fujitsu.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).