Commit f2148c4c authored by Wei Yang's avatar Wei Yang Committed by Dr. David Alan Gilbert
Browse files

migration/multifd: use pages->allocated instead of the static max 



multifd_send_fill_packet() prepares meta data for following pages to
transfer. It would be more proper to fill pages->allocated instead of
static max value, especially we want to support flexible packet size.

Signed-off-by: default avatarWei Yang <richardw.yang@linux.intel.com>
Message-Id: <20191011085050.17622-3-richardw.yang@linux.intel.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent d884e77b

migration/ram.c

+1 −2
Original line number Diff line number Diff line
@@ -791,13 +791,12 @@ static void multifd_pages_clear(MultiFDPages_t *pages) 
static void multifd_send_fill_packet(MultiFDSendParams *p)

{

    MultiFDPacket_t *packet = p->packet;

    uint32_t page_max = MULTIFD_PACKET_SIZE / qemu_target_page_size();

    int i;



    packet->magic = cpu_to_be32(MULTIFD_MAGIC);

    packet->version = cpu_to_be32(MULTIFD_VERSION);

    packet->flags = cpu_to_be32(p->flags);

    packet->pages_alloc = cpu_to_be32(page_max);

    packet->pages_alloc = cpu_to_be32(p->pages->allocated);

    packet->pages_used = cpu_to_be32(p->pages->used);

    packet->next_packet_size = cpu_to_be32(p->next_packet_size);

    packet->packet_num = cpu_to_be64(p->packet_num);