[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/18] multifd: Delete useless operation
From: |
Juan Quintela |
Subject: |
[PULL 07/18] multifd: Delete useless operation |
Date: |
Wed, 15 Dec 2021 11:32:07 +0100 |
We are dividing by page_size to multiply again in the only use.
Once there, improve the comments.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
migration/multifd-zlib.c | 13 ++++---------
migration/multifd-zstd.c | 13 ++++---------
2 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/migration/multifd-zlib.c b/migration/multifd-zlib.c
index ab4ba75d75..3fc7813b44 100644
--- a/migration/multifd-zlib.c
+++ b/migration/multifd-zlib.c
@@ -42,7 +42,6 @@ struct zlib_data {
*/
static int zlib_send_setup(MultiFDSendParams *p, Error **errp)
{
- uint32_t page_count = MULTIFD_PACKET_SIZE / qemu_target_page_size();
struct zlib_data *z = g_malloc0(sizeof(struct zlib_data));
z_stream *zs = &z->zs;
@@ -54,9 +53,8 @@ static int zlib_send_setup(MultiFDSendParams *p, Error **errp)
error_setg(errp, "multifd %d: deflate init failed", p->id);
return -1;
}
- /* We will never have more than page_count pages */
- z->zbuff_len = page_count * qemu_target_page_size();
- z->zbuff_len *= 2;
+ /* To be safe, we reserve twice the size of the packet */
+ z->zbuff_len = MULTIFD_PACKET_SIZE * 2;
z->zbuff = g_try_malloc(z->zbuff_len);
if (!z->zbuff) {
deflateEnd(&z->zs);
@@ -180,7 +178,6 @@ static int zlib_send_write(MultiFDSendParams *p, uint32_t
used, Error **errp)
*/
static int zlib_recv_setup(MultiFDRecvParams *p, Error **errp)
{
- uint32_t page_count = MULTIFD_PACKET_SIZE / qemu_target_page_size();
struct zlib_data *z = g_malloc0(sizeof(struct zlib_data));
z_stream *zs = &z->zs;
@@ -194,10 +191,8 @@ static int zlib_recv_setup(MultiFDRecvParams *p, Error
**errp)
error_setg(errp, "multifd %d: inflate init failed", p->id);
return -1;
}
- /* We will never have more than page_count pages */
- z->zbuff_len = page_count * qemu_target_page_size();
- /* We know compression "could" use more space */
- z->zbuff_len *= 2;
+ /* To be safe, we reserve twice the size of the packet */
+ z->zbuff_len = MULTIFD_PACKET_SIZE * 2;
z->zbuff = g_try_malloc(z->zbuff_len);
if (!z->zbuff) {
inflateEnd(zs);
diff --git a/migration/multifd-zstd.c b/migration/multifd-zstd.c
index 693bddf8c9..cc3b8869c0 100644
--- a/migration/multifd-zstd.c
+++ b/migration/multifd-zstd.c
@@ -47,7 +47,6 @@ struct zstd_data {
*/
static int zstd_send_setup(MultiFDSendParams *p, Error **errp)
{
- uint32_t page_count = MULTIFD_PACKET_SIZE / qemu_target_page_size();
struct zstd_data *z = g_new0(struct zstd_data, 1);
int res;
@@ -67,9 +66,8 @@ static int zstd_send_setup(MultiFDSendParams *p, Error **errp)
p->id, ZSTD_getErrorName(res));
return -1;
}
- /* We will never have more than page_count pages */
- z->zbuff_len = page_count * qemu_target_page_size();
- z->zbuff_len *= 2;
+ /* To be safe, we reserve twice the size of the packet */
+ z->zbuff_len = MULTIFD_PACKET_SIZE * 2;
z->zbuff = g_try_malloc(z->zbuff_len);
if (!z->zbuff) {
ZSTD_freeCStream(z->zcs);
@@ -191,7 +189,6 @@ static int zstd_send_write(MultiFDSendParams *p, uint32_t
used, Error **errp)
*/
static int zstd_recv_setup(MultiFDRecvParams *p, Error **errp)
{
- uint32_t page_count = MULTIFD_PACKET_SIZE / qemu_target_page_size();
struct zstd_data *z = g_new0(struct zstd_data, 1);
int ret;
@@ -212,10 +209,8 @@ static int zstd_recv_setup(MultiFDRecvParams *p, Error
**errp)
return -1;
}
- /* We will never have more than page_count pages */
- z->zbuff_len = page_count * qemu_target_page_size();
- /* We know compression "could" use more space */
- z->zbuff_len *= 2;
+ /* To be safe, we reserve twice the size of the packet */
+ z->zbuff_len = MULTIFD_PACKET_SIZE * 2;
z->zbuff = g_try_malloc(z->zbuff_len);
if (!z->zbuff) {
ZSTD_freeDStream(z->zds);
--
2.33.1
- [PULL 00/18] Migration 20211214 patches, Juan Quintela, 2021/12/15
- [PULL 01/18] migration/ram.c: Remove the qemu_mutex_lock in colo_flush_ram_cache., Juan Quintela, 2021/12/15
- [PULL 03/18] Fixed a QEMU hang when guest poweroff in COLO mode, Juan Quintela, 2021/12/15
- [PULL 04/18] migration/colo: Optimize COLO primary node start code path, Juan Quintela, 2021/12/15
- [PULL 05/18] migration: Remove is_zero_range(), Juan Quintela, 2021/12/15
- [PULL 06/18] dump: Remove is_zero_page(), Juan Quintela, 2021/12/15
- [PULL 08/18] migration: Never call twice qemu_target_page_size(), Juan Quintela, 2021/12/15
- [PULL 02/18] migration/colo: More accurate update checkpoint time, Juan Quintela, 2021/12/15
- [PULL 11/18] multifd: The variable is only used inside the loop, Juan Quintela, 2021/12/15
- [PULL 09/18] multifd: Rename used field to num, Juan Quintela, 2021/12/15
- [PULL 07/18] multifd: Delete useless operation,
Juan Quintela <=
- [PULL 12/18] multifd: remove used parameter from send_prepare() method, Juan Quintela, 2021/12/15
- [PULL 10/18] multifd: Add missing documention, Juan Quintela, 2021/12/15
- [PULL 13/18] multifd: remove used parameter from send_recv_pages() method, Juan Quintela, 2021/12/15
- [PULL 14/18] multifd: Fill offset and block for reception, Juan Quintela, 2021/12/15
- [PULL 15/18] multifd: Shut down the QIO channels to avoid blocking the send threads when they are terminated., Juan Quintela, 2021/12/15
- [PULL 17/18] multifd: Make zstd compression method not use iovs, Juan Quintela, 2021/12/15
- [PULL 16/18] COLO: Move some trace code behind qemu_mutex_unlock_iothread(), Juan Quintela, 2021/12/15
- [PULL 18/18] multifd: Make zlib compression method not use iovs, Juan Quintela, 2021/12/15
- Re: [PULL 00/18] Migration 20211214 patches, Richard Henderson, 2021/12/15