1be5c7
From 5f53448092c944857a2b89138f22c5ab335d8250 Mon Sep 17 00:00:00 2001
1be5c7
From: Juan Quintela <quintela@redhat.com>
1be5c7
Date: Wed, 18 May 2022 02:52:23 -0300
1be5c7
Subject: [PATCH 05/37] multifd: remove used parameter from send_prepare()
1be5c7
 method
1be5c7
MIME-Version: 1.0
1be5c7
Content-Type: text/plain; charset=UTF-8
1be5c7
Content-Transfer-Encoding: 8bit
1be5c7
1be5c7
RH-Author: Leonardo Brás <leobras@redhat.com>
1be5c7
RH-MergeRequest: 191: MSG_ZEROCOPY + Multifd @ rhel8.7
1be5c7
RH-Commit: [5/26] ad6360d19d65e8c332dcdc3d3234478639e03db8
1be5c7
RH-Bugzilla: 2072049
1be5c7
RH-Acked-by: Peter Xu <peterx@redhat.com>
1be5c7
RH-Acked-by: Daniel P. Berrangé <berrange@redhat.com>
1be5c7
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
1be5c7
1be5c7
It is already there as p->pages->num.
1be5c7
1be5c7
Signed-off-by: Juan Quintela <quintela@redhat.com>
1be5c7
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
1be5c7
(cherry picked from commit 02fb81043ecee338e4aeb8f5be09a46325dc5e43)
1be5c7
Signed-off-by: Leonardo Bras <leobras@redhat.com>
1be5c7
---
1be5c7
 migration/multifd-zlib.c | 7 +++----
1be5c7
 migration/multifd-zstd.c | 7 +++----
1be5c7
 migration/multifd.c      | 9 +++------
1be5c7
 migration/multifd.h      | 2 +-
1be5c7
 4 files changed, 10 insertions(+), 15 deletions(-)
1be5c7
1be5c7
diff --git a/migration/multifd-zlib.c b/migration/multifd-zlib.c
1be5c7
index f403d2f031..0c70a2dc78 100644
1be5c7
--- a/migration/multifd-zlib.c
1be5c7
+++ b/migration/multifd-zlib.c
1be5c7
@@ -96,10 +96,9 @@ static void zlib_send_cleanup(MultiFDSendParams *p, Error **errp)
1be5c7
  * Returns 0 for success or -1 for error
1be5c7
  *
1be5c7
  * @p: Params for the channel that we are using
1be5c7
- * @used: number of pages used
1be5c7
  * @errp: pointer to an error
1be5c7
  */
1be5c7
-static int zlib_send_prepare(MultiFDSendParams *p, uint32_t used, Error **errp)
1be5c7
+static int zlib_send_prepare(MultiFDSendParams *p, Error **errp)
1be5c7
 {
1be5c7
     struct iovec *iov = p->pages->iov;
1be5c7
     struct zlib_data *z = p->data;
1be5c7
@@ -108,11 +107,11 @@ static int zlib_send_prepare(MultiFDSendParams *p, uint32_t used, Error **errp)
1be5c7
     int ret;
1be5c7
     uint32_t i;
1be5c7
 
1be5c7
-    for (i = 0; i < used; i++) {
1be5c7
+    for (i = 0; i < p->pages->num; i++) {
1be5c7
         uint32_t available = z->zbuff_len - out_size;
1be5c7
         int flush = Z_NO_FLUSH;
1be5c7
 
1be5c7
-        if (i == used - 1) {
1be5c7
+        if (i == p->pages->num - 1) {
1be5c7
             flush = Z_SYNC_FLUSH;
1be5c7
         }
1be5c7
 
1be5c7
diff --git a/migration/multifd-zstd.c b/migration/multifd-zstd.c
1be5c7
index 8d657f8860..466b370cad 100644
1be5c7
--- a/migration/multifd-zstd.c
1be5c7
+++ b/migration/multifd-zstd.c
1be5c7
@@ -109,10 +109,9 @@ static void zstd_send_cleanup(MultiFDSendParams *p, Error **errp)
1be5c7
  * Returns 0 for success or -1 for error
1be5c7
  *
1be5c7
  * @p: Params for the channel that we are using
1be5c7
- * @used: number of pages used
1be5c7
  * @errp: pointer to an error
1be5c7
  */
1be5c7
-static int zstd_send_prepare(MultiFDSendParams *p, uint32_t used, Error **errp)
1be5c7
+static int zstd_send_prepare(MultiFDSendParams *p, Error **errp)
1be5c7
 {
1be5c7
     struct iovec *iov = p->pages->iov;
1be5c7
     struct zstd_data *z = p->data;
1be5c7
@@ -123,10 +122,10 @@ static int zstd_send_prepare(MultiFDSendParams *p, uint32_t used, Error **errp)
1be5c7
     z->out.size = z->zbuff_len;
1be5c7
     z->out.pos = 0;
1be5c7
 
1be5c7
-    for (i = 0; i < used; i++) {
1be5c7
+    for (i = 0; i < p->pages->num; i++) {
1be5c7
         ZSTD_EndDirective flush = ZSTD_e_continue;
1be5c7
 
1be5c7
-        if (i == used - 1) {
1be5c7
+        if (i == p->pages->num - 1) {
1be5c7
             flush = ZSTD_e_flush;
1be5c7
         }
1be5c7
         z->in.src = iov[i].iov_base;
1be5c7
diff --git a/migration/multifd.c b/migration/multifd.c
1be5c7
index ce7101cf9d..098ef8842c 100644
1be5c7
--- a/migration/multifd.c
1be5c7
+++ b/migration/multifd.c
1be5c7
@@ -82,13 +82,11 @@ static void nocomp_send_cleanup(MultiFDSendParams *p, Error **errp)
1be5c7
  * Returns 0 for success or -1 for error
1be5c7
  *
1be5c7
  * @p: Params for the channel that we are using
1be5c7
- * @used: number of pages used
1be5c7
  * @errp: pointer to an error
1be5c7
  */
1be5c7
-static int nocomp_send_prepare(MultiFDSendParams *p, uint32_t used,
1be5c7
-                               Error **errp)
1be5c7
+static int nocomp_send_prepare(MultiFDSendParams *p, Error **errp)
1be5c7
 {
1be5c7
-    p->next_packet_size = used * qemu_target_page_size();
1be5c7
+    p->next_packet_size = p->pages->num * qemu_target_page_size();
1be5c7
     p->flags |= MULTIFD_FLAG_NOCOMP;
1be5c7
     return 0;
1be5c7
 }
1be5c7
@@ -654,8 +652,7 @@ static void *multifd_send_thread(void *opaque)
1be5c7
             uint32_t flags = p->flags;
1be5c7
 
1be5c7
             if (used) {
1be5c7
-                ret = multifd_send_state->ops->send_prepare(p, used,
1be5c7
-                                                            &local_err);
1be5c7
+                ret = multifd_send_state->ops->send_prepare(p, &local_err);
1be5c7
                 if (ret != 0) {
1be5c7
                     qemu_mutex_unlock(&p->mutex);
1be5c7
                     break;
1be5c7
diff --git a/migration/multifd.h b/migration/multifd.h
1be5c7
index 86820dd028..7968cc5c20 100644
1be5c7
--- a/migration/multifd.h
1be5c7
+++ b/migration/multifd.h
1be5c7
@@ -159,7 +159,7 @@ typedef struct {
1be5c7
     /* Cleanup for sending side */
1be5c7
     void (*send_cleanup)(MultiFDSendParams *p, Error **errp);
1be5c7
     /* Prepare the send packet */
1be5c7
-    int (*send_prepare)(MultiFDSendParams *p, uint32_t used, Error **errp);
1be5c7
+    int (*send_prepare)(MultiFDSendParams *p, Error **errp);
1be5c7
     /* Write the send packet */
1be5c7
     int (*send_write)(MultiFDSendParams *p, uint32_t used, Error **errp);
1be5c7
     /* Setup for receiving side */
1be5c7
-- 
1be5c7
2.35.3
1be5c7