150 lines
5.5 KiB
Diff
150 lines
5.5 KiB
Diff
From 8cdedf86dc193673ea24516e7b44f8b4da5dd713 Mon Sep 17 00:00:00 2001
|
|
From: Juan Quintela <quintela@redhat.com>
|
|
Date: Wed, 18 May 2022 02:52:23 -0300
|
|
Subject: [PATCH 06/37] multifd: remove used parameter from send_recv_pages()
|
|
method
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Leonardo Brás <leobras@redhat.com>
|
|
RH-MergeRequest: 191: MSG_ZEROCOPY + Multifd @ rhel8.7
|
|
RH-Commit: [6/26] 5c1a506e4178501a0894ea4e7ac919e1d4d4cc32
|
|
RH-Bugzilla: 2072049
|
|
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
|
RH-Acked-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
|
It is already there as p->pages->num.
|
|
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
(cherry picked from commit 40a4bfe9d3f8ad35a9c3ffb4cbf7367e2777054b)
|
|
Signed-off-by: Leonardo Bras <leobras@redhat.com>
|
|
---
|
|
migration/multifd-zlib.c | 9 ++++-----
|
|
migration/multifd-zstd.c | 7 +++----
|
|
migration/multifd.c | 7 +++----
|
|
migration/multifd.h | 2 +-
|
|
4 files changed, 11 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/migration/multifd-zlib.c b/migration/multifd-zlib.c
|
|
index 0c70a2dc78..330fc021c5 100644
|
|
--- a/migration/multifd-zlib.c
|
|
+++ b/migration/multifd-zlib.c
|
|
@@ -235,17 +235,16 @@ static void zlib_recv_cleanup(MultiFDRecvParams *p)
|
|
* Returns 0 for success or -1 for error
|
|
*
|
|
* @p: Params for the channel that we are using
|
|
- * @used: number of pages used
|
|
* @errp: pointer to an error
|
|
*/
|
|
-static int zlib_recv_pages(MultiFDRecvParams *p, uint32_t used, Error **errp)
|
|
+static int zlib_recv_pages(MultiFDRecvParams *p, Error **errp)
|
|
{
|
|
struct zlib_data *z = p->data;
|
|
z_stream *zs = &z->zs;
|
|
uint32_t in_size = p->next_packet_size;
|
|
/* we measure the change of total_out */
|
|
uint32_t out_size = zs->total_out;
|
|
- uint32_t expected_size = used * qemu_target_page_size();
|
|
+ uint32_t expected_size = p->pages->num * qemu_target_page_size();
|
|
uint32_t flags = p->flags & MULTIFD_FLAG_COMPRESSION_MASK;
|
|
int ret;
|
|
int i;
|
|
@@ -264,12 +263,12 @@ static int zlib_recv_pages(MultiFDRecvParams *p, uint32_t used, Error **errp)
|
|
zs->avail_in = in_size;
|
|
zs->next_in = z->zbuff;
|
|
|
|
- for (i = 0; i < used; i++) {
|
|
+ for (i = 0; i < p->pages->num; i++) {
|
|
struct iovec *iov = &p->pages->iov[i];
|
|
int flush = Z_NO_FLUSH;
|
|
unsigned long start = zs->total_out;
|
|
|
|
- if (i == used - 1) {
|
|
+ if (i == p->pages->num - 1) {
|
|
flush = Z_SYNC_FLUSH;
|
|
}
|
|
|
|
diff --git a/migration/multifd-zstd.c b/migration/multifd-zstd.c
|
|
index 466b370cad..f0d1105792 100644
|
|
--- a/migration/multifd-zstd.c
|
|
+++ b/migration/multifd-zstd.c
|
|
@@ -255,14 +255,13 @@ static void zstd_recv_cleanup(MultiFDRecvParams *p)
|
|
* Returns 0 for success or -1 for error
|
|
*
|
|
* @p: Params for the channel that we are using
|
|
- * @used: number of pages used
|
|
* @errp: pointer to an error
|
|
*/
|
|
-static int zstd_recv_pages(MultiFDRecvParams *p, uint32_t used, Error **errp)
|
|
+static int zstd_recv_pages(MultiFDRecvParams *p, Error **errp)
|
|
{
|
|
uint32_t in_size = p->next_packet_size;
|
|
uint32_t out_size = 0;
|
|
- uint32_t expected_size = used * qemu_target_page_size();
|
|
+ uint32_t expected_size = p->pages->num * qemu_target_page_size();
|
|
uint32_t flags = p->flags & MULTIFD_FLAG_COMPRESSION_MASK;
|
|
struct zstd_data *z = p->data;
|
|
int ret;
|
|
@@ -283,7 +282,7 @@ static int zstd_recv_pages(MultiFDRecvParams *p, uint32_t used, Error **errp)
|
|
z->in.size = in_size;
|
|
z->in.pos = 0;
|
|
|
|
- for (i = 0; i < used; i++) {
|
|
+ for (i = 0; i < p->pages->num; i++) {
|
|
struct iovec *iov = &p->pages->iov[i];
|
|
|
|
z->out.dst = iov->iov_base;
|
|
diff --git a/migration/multifd.c b/migration/multifd.c
|
|
index 098ef8842c..55d99a8232 100644
|
|
--- a/migration/multifd.c
|
|
+++ b/migration/multifd.c
|
|
@@ -141,10 +141,9 @@ static void nocomp_recv_cleanup(MultiFDRecvParams *p)
|
|
* Returns 0 for success or -1 for error
|
|
*
|
|
* @p: Params for the channel that we are using
|
|
- * @used: number of pages used
|
|
* @errp: pointer to an error
|
|
*/
|
|
-static int nocomp_recv_pages(MultiFDRecvParams *p, uint32_t used, Error **errp)
|
|
+static int nocomp_recv_pages(MultiFDRecvParams *p, Error **errp)
|
|
{
|
|
uint32_t flags = p->flags & MULTIFD_FLAG_COMPRESSION_MASK;
|
|
|
|
@@ -153,7 +152,7 @@ static int nocomp_recv_pages(MultiFDRecvParams *p, uint32_t used, Error **errp)
|
|
p->id, flags, MULTIFD_FLAG_NOCOMP);
|
|
return -1;
|
|
}
|
|
- return qio_channel_readv_all(p->c, p->pages->iov, used, errp);
|
|
+ return qio_channel_readv_all(p->c, p->pages->iov, p->pages->num, errp);
|
|
}
|
|
|
|
static MultiFDMethods multifd_nocomp_ops = {
|
|
@@ -1099,7 +1098,7 @@ static void *multifd_recv_thread(void *opaque)
|
|
qemu_mutex_unlock(&p->mutex);
|
|
|
|
if (used) {
|
|
- ret = multifd_recv_state->ops->recv_pages(p, used, &local_err);
|
|
+ ret = multifd_recv_state->ops->recv_pages(p, &local_err);
|
|
if (ret != 0) {
|
|
break;
|
|
}
|
|
diff --git a/migration/multifd.h b/migration/multifd.h
|
|
index 7968cc5c20..e57adc783b 100644
|
|
--- a/migration/multifd.h
|
|
+++ b/migration/multifd.h
|
|
@@ -167,7 +167,7 @@ typedef struct {
|
|
/* Cleanup for receiving side */
|
|
void (*recv_cleanup)(MultiFDRecvParams *p);
|
|
/* Read all pages */
|
|
- int (*recv_pages)(MultiFDRecvParams *p, uint32_t used, Error **errp);
|
|
+ int (*recv_pages)(MultiFDRecvParams *p, Error **errp);
|
|
} MultiFDMethods;
|
|
|
|
void multifd_register_ops(int method, MultiFDMethods *ops);
|
|
--
|
|
2.35.3
|
|
|