SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

migration/multifd: correct multifd_send_thread to trace the flags

Browse Source 
The p->flags could be updated via the send_prepare callback, e.g. OR-ed
with MULTIFD_FLAG_ZLIB via zlib_send_prepare. Assign p->flags to the
local "flags" before the send_prepare callback could only get partial of
p->flags. Fix it by moving the assignment of p->flags to the local flags
after the callback, so that the correct flags can be traced.

Fixes: ab7cbb0b9a3b ("multifd: Make no compression operations into its own structure")
Signed-off-by: Wei Wang <wei.w.wang@intel.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Wei Wang 2023-03-09 18:29:56 +08:00 committed by Juan Quintela
parent bf0274192a
commit ff1585d1d8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
migration/multifd.c
View File

@ -677,7 +677,7 @@ static void *multifd_send_thread(void *opaque)
if (p->pending_job) { if (p->pending_job) {
uint64_t packet_num = p->packet_num; uint64_t packet_num = p->packet_num;
uint32_t flags = p->flags; uint32_t flags;
p->normal_num = 0; p->normal_num = 0;
if (use_zero_copy_send) { if (use_zero_copy_send) {
@ -699,6 +699,7 @@ static void *multifd_send_thread(void *opaque)
} }
} }
multifd_send_fill_packet(p); multifd_send_fill_packet(p);
flags = p->flags;
p->flags = 0; p->flags = 0;
p->num_packets++; p->num_packets++;
p->total_normal_pages += p->normal_num; p->total_normal_pages += p->normal_num;