diff options
| author | Peter Xu <peterx@redhat.com> | 2024-02-02 18:28:44 +0800 |
|---|---|---|
| committer | Peter Xu <peterx@redhat.com> | 2024-02-05 14:42:10 +0800 |
| commit | db7e1cc5103137743394a939045a17fa2b30a0dc (patch) | |
| tree | 12e35071b09f4971c4f7541028ee2d1a76ded8c0 /migration | |
| parent | 05b7ec1890158471afb8537a6817a7e0d0a6c938 (diff) | |
| download | qemu-db7e1cc5103137743394a939045a17fa2b30a0dc.zip qemu-db7e1cc5103137743394a939045a17fa2b30a0dc.tar.gz qemu-db7e1cc5103137743394a939045a17fa2b30a0dc.tar.bz2 | |
migration/multifd: Move total_normal_pages accounting
Just like the previous patch, move the accounting for total_normal_pages on
both src/dst sides into the packet fill/unfill procedures.
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Link: https://lore.kernel.org/r/20240202102857.110210-11-peterx@redhat.com
Signed-off-by: Peter Xu <peterx@redhat.com>
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/multifd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/migration/multifd.c b/migration/multifd.c index eca76e2..94a0124 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -290,6 +290,7 @@ static void multifd_send_fill_packet(MultiFDSendParams *p) } p->packets_sent++; + p->total_normal_pages += pages->num; } static int multifd_recv_unfill_packet(MultiFDRecvParams *p, Error **errp) @@ -338,6 +339,7 @@ static int multifd_recv_unfill_packet(MultiFDRecvParams *p, Error **errp) p->next_packet_size = be32_to_cpu(packet->next_packet_size); p->packet_num = be64_to_cpu(packet->packet_num); p->packets_recved++; + p->total_normal_pages += p->normal_num; if (p->normal_num == 0) { return 0; @@ -720,7 +722,6 @@ static void *multifd_send_thread(void *opaque) } multifd_send_fill_packet(p); - p->total_normal_pages += pages->num; trace_multifd_send(p->id, packet_num, pages->num, p->flags, p->next_packet_size); @@ -1124,7 +1125,6 @@ static void *multifd_recv_thread(void *opaque) p->flags &= ~MULTIFD_FLAG_SYNC; trace_multifd_recv(p->id, p->packet_num, p->normal_num, flags, p->next_packet_size); - p->total_normal_pages += p->normal_num; qemu_mutex_unlock(&p->mutex); if (p->normal_num) { |