diff options
author | Juan Quintela <quintela@redhat.com> | 2022-05-02 16:53:12 +0200 |
---|---|---|
committer | Juan Quintela <quintela@redhat.com> | 2022-12-15 10:30:37 +0100 |
commit | d6f45eba2bb1dbf48c05adcf3e14040b913d2085 (patch) | |
tree | c93844198d6cdbfa8322faf0ef10adc2a7c2739a /migration/multifd.c | |
parent | ddec20f858800cfe3ff7f56aec486dab0585e8b1 (diff) | |
download | qemu-d6f45eba2bb1dbf48c05adcf3e14040b913d2085.zip qemu-d6f45eba2bb1dbf48c05adcf3e14040b913d2085.tar.gz qemu-d6f45eba2bb1dbf48c05adcf3e14040b913d2085.tar.bz2 |
multifd: Create page_count fields into both MultiFD{Recv,Send}Params
We were recalculating it left and right. We plan to change that
values on next patches.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Leonardo Bras <leobras@redhat.com>
Diffstat (limited to 'migration/multifd.c')
-rw-r--r-- | migration/multifd.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/migration/multifd.c b/migration/multifd.c index efffa77..b8dc559 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -279,7 +279,6 @@ static void multifd_send_fill_packet(MultiFDSendParams *p) static int multifd_recv_unfill_packet(MultiFDRecvParams *p, Error **errp) { MultiFDPacket_t *packet = p->packet; - uint32_t page_count = MULTIFD_PACKET_SIZE / p->page_size; RAMBlock *block; int i; @@ -306,10 +305,10 @@ static int multifd_recv_unfill_packet(MultiFDRecvParams *p, Error **errp) * If we received a packet that is 100 times bigger than expected * just stop migration. It is a magic number. */ - if (packet->pages_alloc > page_count) { + if (packet->pages_alloc > p->page_count) { error_setg(errp, "multifd: received packet " "with size %u and expected a size of %u", - packet->pages_alloc, page_count) ; + packet->pages_alloc, p->page_count) ; return -1; } @@ -944,6 +943,7 @@ int multifd_save_setup(Error **errp) p->iov = g_new0(struct iovec, page_count + 1); p->normal = g_new0(ram_addr_t, page_count); p->page_size = qemu_target_page_size(); + p->page_count = page_count; if (migrate_use_zero_copy_send()) { p->write_flags = QIO_CHANNEL_WRITE_FLAG_ZERO_COPY; @@ -1191,6 +1191,7 @@ int multifd_load_setup(Error **errp) p->name = g_strdup_printf("multifdrecv_%d", i); p->iov = g_new0(struct iovec, page_count); p->normal = g_new0(ram_addr_t, page_count); + p->page_count = page_count; p->page_size = qemu_target_page_size(); } |