multifd: Rename pages_used to normal_pages
Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
parent
faf60935df
commit
8c0ec0b2b0
|
@ -262,7 +262,7 @@ static void multifd_send_fill_packet(MultiFDSendParams *p)
|
||||||
|
|
||||||
packet->flags = cpu_to_be32(p->flags);
|
packet->flags = cpu_to_be32(p->flags);
|
||||||
packet->pages_alloc = cpu_to_be32(p->pages->allocated);
|
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->next_packet_size = cpu_to_be32(p->next_packet_size);
|
||||||
packet->packet_num = cpu_to_be64(p->packet_num);
|
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;
|
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) {
|
if (p->normal_num > packet->pages_alloc) {
|
||||||
error_setg(errp, "multifd: received packet "
|
error_setg(errp, "multifd: received packet "
|
||||||
"with %u pages and expected maximum pages are %u",
|
"with %u pages and expected maximum pages are %u",
|
||||||
|
|
|
@ -44,7 +44,8 @@ typedef struct {
|
||||||
uint32_t flags;
|
uint32_t flags;
|
||||||
/* maximum number of allocated pages */
|
/* maximum number of allocated pages */
|
||||||
uint32_t pages_alloc;
|
uint32_t pages_alloc;
|
||||||
uint32_t pages_used;
|
/* non zero pages */
|
||||||
|
uint32_t normal_pages;
|
||||||
/* size of the next packet that contains pages */
|
/* size of the next packet that contains pages */
|
||||||
uint32_t next_packet_size;
|
uint32_t next_packet_size;
|
||||||
uint64_t packet_num;
|
uint64_t packet_num;
|
||||||
|
|
Loading…
Reference in a new issue