projects
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e3cce9a
)
migration/multifd: Drop pages->num check in sender thread
author
Peter Xu
<peterx@redhat.com>
Fri, 2 Feb 2024 10:28:42 +0000
(18:28 +0800)
committer
Peter Xu
<peterx@redhat.com>
Mon, 5 Feb 2024 06:42:10 +0000
(14:42 +0800)
Now with a split SYNC handler, we always have pages->num set for
pending_job==true. Assert it instead.
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Link:
https://lore.kernel.org/r/20240202102857.110210-9-peterx@redhat.com
Signed-off-by: Peter Xu <peterx@redhat.com>
migration/multifd.c
patch
|
blob
|
history
diff --git
a/migration/multifd.c
b/migration/multifd.c
index 4d5a01ed93e64b6e76499419599e1444035d4c53..518f9de72346b2c34a28ef6203eab2c36621fc79 100644
(file)
--- a/
migration/multifd.c
+++ b/
migration/multifd.c
@@
-710,13
+710,14
@@
static void *multifd_send_thread(void *opaque)
p->iovs_num = 1;
}
- if (pages->num) {
- ret = multifd_send_state->ops->send_prepare(p, &local_err);
- if (ret != 0) {
- qemu_mutex_unlock(&p->mutex);
-
break
;
- }
+ assert(pages->num);
+
+ ret = multifd_send_state->ops->send_prepare(p, &local_err);
+ if (ret != 0) {
+
qemu_mutex_unlock(&p->mutex)
;
+ break;
}
+
multifd_send_fill_packet(p);
p->num_packets++;
p->total_normal_pages += pages->num;