migration/rdma: Check sooner if we are in postcopy for save_page()
authorJuan Quintela <quintela@redhat.com>
Wed, 11 Oct 2023 20:35:24 +0000 (22:35 +0200)
committerJuan Quintela <quintela@redhat.com>
Tue, 17 Oct 2023 07:25:13 +0000 (09:25 +0200)
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Li Zhijian <lizhijian@fujitsu.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20231011203527.9061-11-quintela@redhat.com>

migration/rdma.c

index c147c94b084dcc8a13ccd665d1540308348c993b..e973579a52c75e4708499a6b22c3772cd3a60a50 100644 (file)
@@ -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;
     }