4841a6
From 8c1edb1889ff44506f35fa185d6569b0dd9d7260 Mon Sep 17 00:00:00 2001
719b13
From: Juan Quintela <quintela@redhat.com>
719b13
Date: Wed, 18 May 2022 02:52:23 -0300
4841a6
Subject: [PATCH 07/37] multifd: Fill offset and block for reception
719b13
MIME-Version: 1.0
719b13
Content-Type: text/plain; charset=UTF-8
719b13
Content-Transfer-Encoding: 8bit
719b13
719b13
RH-Author: Leonardo Brás <leobras@redhat.com>
4841a6
RH-MergeRequest: 191: MSG_ZEROCOPY + Multifd @ rhel8.7
4841a6
RH-Commit: [7/26] 51a9e6b76af956d63fc735172211d9bf6f0f6f80
4841a6
RH-Bugzilla: 2072049
719b13
RH-Acked-by: Peter Xu <peterx@redhat.com>
4841a6
RH-Acked-by: Daniel P. Berrangé <berrange@redhat.com>
4841a6
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
719b13
719b13
We were using the iov directly, but we will need this info on the
719b13
following patch.
719b13
719b13
Signed-off-by: Juan Quintela <quintela@redhat.com>
719b13
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
719b13
(cherry picked from commit 01102a2ef6c97acc5cc8a2c3bb62b7665a20f51f)
719b13
Signed-off-by: Leonardo Bras <leobras@redhat.com>
719b13
---
719b13
 migration/multifd.c | 2 ++
719b13
 1 file changed, 2 insertions(+)
719b13
719b13
diff --git a/migration/multifd.c b/migration/multifd.c
719b13
index 55d99a8232..0533da154a 100644
719b13
--- a/migration/multifd.c
719b13
+++ b/migration/multifd.c
719b13
@@ -354,6 +354,7 @@ static int multifd_recv_unfill_packet(MultiFDRecvParams *p, Error **errp)
719b13
         return -1;
719b13
     }
719b13
 
719b13
+    p->pages->block = block;
719b13
     for (i = 0; i < p->pages->num; i++) {
719b13
         uint64_t offset = be64_to_cpu(packet->offset[i]);
719b13
 
719b13
@@ -363,6 +364,7 @@ static int multifd_recv_unfill_packet(MultiFDRecvParams *p, Error **errp)
719b13
                        offset, block->used_length);
719b13
             return -1;
719b13
         }
719b13
+        p->pages->offset[i] = offset;
719b13
         p->pages->iov[i].iov_base = block->host + offset;
719b13
         p->pages->iov[i].iov_len = page_size;
719b13
     }
719b13
-- 
719b13
2.35.3
719b13