diff options
| author | Peter Xu <peterx@redhat.com> | 2024-02-02 18:28:42 +0800 |
|---|---|---|
| committer | Peter Xu <peterx@redhat.com> | 2024-02-05 14:42:10 +0800 |
| commit | 83c560fb4249ee5698652249e0c1730c3d611a9b (patch) | |
| tree | d83c778620a7b42b778b9887946f4afb752199b0 /migration | |
| parent | e3cce9af10b06c51434ced4e1a6686f1ce43e124 (diff) | |
| download | qemu-83c560fb4249ee5698652249e0c1730c3d611a9b.zip qemu-83c560fb4249ee5698652249e0c1730c3d611a9b.tar.gz qemu-83c560fb4249ee5698652249e0c1730c3d611a9b.tar.bz2 | |
migration/multifd: Drop pages->num check in sender thread
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>
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/multifd.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/migration/multifd.c b/migration/multifd.c index 4d5a01e..518f9de 100644 --- 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; |