openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

multifd: Rename "size" member to pages_alloc 

It really indicates what is the number of allocated pages for one
packet.  Once there rename "used" to "pages_used".

Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Juan Quintela 2019-02-20 12:04:04 +01:00
parent ad24c7cb59
commit 6f86269295
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
migration/ram.c
View File

@ -594,8 +594,9 @@ typedef struct {
uint32_t magic; uint32_t magic;
uint32_t version; uint32_t version;
uint32_t flags; uint32_t flags;
uint32_t size; /* maximum number of allocated pages */
uint32_t used; uint32_t pages_alloc;
uint32_t pages_used;
uint64_t packet_num; uint64_t packet_num;
char ramblock[256]; char ramblock[256];
uint64_t offset[]; uint64_t offset[];
@ -781,8 +782,8 @@ static void multifd_send_fill_packet(MultiFDSendParams *p)
packet->magic = cpu_to_be32(MULTIFD_MAGIC); packet->magic = cpu_to_be32(MULTIFD_MAGIC);
packet->version = cpu_to_be32(MULTIFD_VERSION); packet->version = cpu_to_be32(MULTIFD_VERSION);
packet->flags = cpu_to_be32(p->flags); packet->flags = cpu_to_be32(p->flags);
packet->size = cpu_to_be32(migrate_multifd_page_count()); packet->pages_alloc = cpu_to_be32(migrate_multifd_page_count());
packet->used = cpu_to_be32(p->pages->used); packet->pages_used = cpu_to_be32(p->pages->used);
packet->packet_num = cpu_to_be64(p->packet_num); packet->packet_num = cpu_to_be64(p->packet_num);
if (p->pages->block) { if (p->pages->block) {
@ -818,19 +819,19 @@ static int multifd_recv_unfill_packet(MultiFDRecvParams *p, Error **errp)
p->flags = be32_to_cpu(packet->flags); p->flags = be32_to_cpu(packet->flags);
packet->size = be32_to_cpu(packet->size); packet->pages_alloc = be32_to_cpu(packet->pages_alloc);
if (packet->size > migrate_multifd_page_count()) { if (packet->pages_alloc > migrate_multifd_page_count()) {
error_setg(errp, "multifd: received packet " error_setg(errp, "multifd: received packet "
"with size %d and expected maximum size %d", "with size %d and expected maximum size %d",
packet->size, migrate_multifd_page_count()) ; packet->pages_alloc, migrate_multifd_page_count()) ;
return -1; return -1;
} }
p->pages->used = be32_to_cpu(packet->used); p->pages->used = be32_to_cpu(packet->pages_used);
if (p->pages->used > packet->size) { if (p->pages->used > packet->pages_alloc) {
error_setg(errp, "multifd: received packet " error_setg(errp, "multifd: received packet "
"with size %d and expected maximum size %d", "with %d pages and expected maximum pages are %d",
p->pages->used, packet->size) ; p->pages->used, packet->pages_alloc) ;
return -1; return -1;
} }