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

migration/multifd: initialize packet->magic/version once at setup stage 



MultiFDPacket_t's magic and version field never changes during
migration, so move these two fields in setup stage.

Signed-off-by: default avatarWei Yang <richardw.yang@linux.intel.com>
Message-Id: <20191011085050.17622-4-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 f2148c4c

migration/ram.c

+2 −2
Original line number Diff line number Diff line
@@ -793,8 +793,6 @@ static void multifd_send_fill_packet(MultiFDSendParams *p) 
    MultiFDPacket_t *packet = p->packet;

    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(p->pages->allocated);

    packet->pages_used = cpu_to_be32(p->pages->used);
@@ -1240,6 +1238,8 @@ int multifd_save_setup(void) 
        p->packet_len = sizeof(MultiFDPacket_t)

                      + sizeof(ram_addr_t) * page_count;

        p->packet = g_malloc0(p->packet_len);

        p->packet->magic = cpu_to_be32(MULTIFD_MAGIC);

        p->packet->version = cpu_to_be32(MULTIFD_VERSION);

        p->name = g_strdup_printf("multifdsend_%d", i);

        socket_send_channel_create(multifd_new_send_channel_async, p);

    }