|
 |
4841a6 |
From 1cdab9cadef1ed84ec34651a1edbffa36c1e67d0 Mon Sep 17 00:00:00 2001
|
|
|
719b13 |
From: Juan Quintela <quintela@redhat.com>
|
|
|
719b13 |
Date: Wed, 18 May 2022 02:52:24 -0300
|
|
|
4841a6 |
Subject: [PATCH 12/37] multifd: Make zlib use iov's
|
|
|
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: [12/26] 58630452e14802e71a9eadb17cfe4964ebf8e091
|
|
|
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 |
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
|
719b13 |
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
719b13 |
(cherry picked from commit 48a4a44c1cde382c6b8e7792d01fe7d9b0a59c69)
|
|
|
719b13 |
Signed-off-by: Leonardo Bras <leobras@redhat.com>
|
|
|
719b13 |
---
|
|
|
719b13 |
migration/multifd-zlib.c | 8 ++++----
|
|
|
719b13 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
719b13 |
|
|
|
719b13 |
diff --git a/migration/multifd-zlib.c b/migration/multifd-zlib.c
|
|
|
719b13 |
index a987e4a26c..96475e096e 100644
|
|
|
719b13 |
--- a/migration/multifd-zlib.c
|
|
|
719b13 |
+++ b/migration/multifd-zlib.c
|
|
|
719b13 |
@@ -145,6 +145,9 @@ static int zlib_send_prepare(MultiFDSendParams *p, Error **errp)
|
|
|
719b13 |
}
|
|
|
719b13 |
out_size += available - zs->avail_out;
|
|
|
719b13 |
}
|
|
|
719b13 |
+ p->iov[p->iovs_num].iov_base = z->zbuff;
|
|
|
719b13 |
+ p->iov[p->iovs_num].iov_len = out_size;
|
|
|
719b13 |
+ p->iovs_num++;
|
|
|
719b13 |
p->next_packet_size = out_size;
|
|
|
719b13 |
p->flags |= MULTIFD_FLAG_ZLIB;
|
|
|
719b13 |
|
|
|
719b13 |
@@ -164,10 +167,7 @@ static int zlib_send_prepare(MultiFDSendParams *p, Error **errp)
|
|
|
719b13 |
*/
|
|
|
719b13 |
static int zlib_send_write(MultiFDSendParams *p, uint32_t used, Error **errp)
|
|
|
719b13 |
{
|
|
|
719b13 |
- struct zlib_data *z = p->data;
|
|
|
719b13 |
-
|
|
|
719b13 |
- return qio_channel_write_all(p->c, (void *)z->zbuff, p->next_packet_size,
|
|
|
719b13 |
- errp);
|
|
|
719b13 |
+ return qio_channel_writev_all(p->c, p->iov, p->iovs_num, errp);
|
|
|
719b13 |
}
|
|
|
719b13 |
|
|
|
719b13 |
/**
|
|
|
719b13 |
--
|
|
|
719b13 |
2.35.3
|
|
|
719b13 |
|