[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 17/36] multifd: Rename pages_used to normal_pages
From: |
Juan Quintela |
Subject: |
[PULL 17/36] multifd: Rename pages_used to normal_pages |
Date: |
Fri, 28 Jan 2022 19:30:14 +0100 |
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
migration/multifd.h | 3 ++-
migration/multifd.c | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/migration/multifd.h b/migration/multifd.h
index be460f821b..4dda900a0b 100644
--- a/migration/multifd.h
+++ b/migration/multifd.h
@@ -44,7 +44,8 @@ typedef struct {
uint32_t flags;
/* maximum number of allocated pages */
uint32_t pages_alloc;
- uint32_t pages_used;
+ /* non zero pages */
+ uint32_t normal_pages;
/* size of the next packet that contains pages */
uint32_t next_packet_size;
uint64_t packet_num;
diff --git a/migration/multifd.c b/migration/multifd.c
index b39fef5dfe..76b57a7177 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -262,7 +262,7 @@ static void multifd_send_fill_packet(MultiFDSendParams *p)
packet->flags = cpu_to_be32(p->flags);
packet->pages_alloc = cpu_to_be32(p->pages->allocated);
- packet->pages_used = cpu_to_be32(p->normal_num);
+ packet->normal_pages = cpu_to_be32(p->normal_num);
packet->next_packet_size = cpu_to_be32(p->next_packet_size);
packet->packet_num = cpu_to_be64(p->packet_num);
@@ -316,7 +316,7 @@ static int multifd_recv_unfill_packet(MultiFDRecvParams *p,
Error **errp)
return -1;
}
- p->normal_num = be32_to_cpu(packet->pages_used);
+ p->normal_num = be32_to_cpu(packet->normal_pages);
if (p->normal_num > packet->pages_alloc) {
error_setg(errp, "multifd: received packet "
"with %u pages and expected maximum pages are %u",
--
2.34.1
- [PULL 07/36] multifd: Use proper maximum compression values, (continued)
- [PULL 07/36] multifd: Use proper maximum compression values, Juan Quintela, 2022/01/28
- [PULL 08/36] multifd: Move iov from pages to params, Juan Quintela, 2022/01/28
- [PULL 11/36] multifd: Remove send_write() method, Juan Quintela, 2022/01/28
- [PULL 09/36] multifd: Make zlib use iov's, Juan Quintela, 2022/01/28
- [PULL 12/36] multifd: Use a single writev on the send side, Juan Quintela, 2022/01/28
- [PULL 10/36] multifd: Make zstd use iov's, Juan Quintela, 2022/01/28
- [PULL 13/36] multifd: Unfold "used" variable by its value, Juan Quintela, 2022/01/28
- [PULL 14/36] multifd: Use normal pages array on the send side, Juan Quintela, 2022/01/28
- [PULL 15/36] multifd: Use normal pages array on the recv side, Juan Quintela, 2022/01/28
- [PULL 16/36] multifd: recv side only needs the RAMBlock host address, Juan Quintela, 2022/01/28
- [PULL 17/36] multifd: Rename pages_used to normal_pages,
Juan Quintela <=
- [PULL 18/36] Remove unnecessary minimum_version_id_old fields, Juan Quintela, 2022/01/28
- [PULL 19/36] migration/migration.c: Add missed default error handler for migration state, Juan Quintela, 2022/01/28
- [PULL 20/36] migration/migration.c: Avoid COLO boot in postcopy migration, Juan Quintela, 2022/01/28
- [PULL 21/36] migration/migration.c: Remove the MIGRATION_STATUS_ACTIVE when migration finished, Juan Quintela, 2022/01/28
- [PULL 22/36] migration: Report the error returned when save_live_iterate fails, Juan Quintela, 2022/01/28
- [PULL 24/36] migration: Drop dead code of ram_debug_dump_bitmap(), Juan Quintela, 2022/01/28
- [PULL 23/36] migration/ram: clean up unused comment., Juan Quintela, 2022/01/28
- [PULL 25/36] migration: Don't return for postcopy_chunk_hostpages(), Juan Quintela, 2022/01/28
- [PULL 26/36] migration: Drop postcopy_chunk_hostpages(), Juan Quintela, 2022/01/28
- [PULL 27/36] migration: Do chunk page in postcopy_each_ram_send_discard(), Juan Quintela, 2022/01/28