* Juan Quintela (quintela@xxxxxxxxxx) wrote:
> We add a bool to indicate that.
>
> Signed-off-by: Juan Quintela <quintela@xxxxxxxxxx>
OK, similar to send.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@xxxxxxxxxx>
> ---
> migration/ram.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/migration/ram.c b/migration/ram.c
> index 87bb7da8e2..eb6716710e 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -677,6 +677,8 @@ typedef struct {
> QemuMutex mutex;
> /* is this channel thread running */
> bool running;
> + /* should this thread finish */
> + bool quit;
> /* array of pages to receive */
> MultiFDPages_t *pages;
> /* packet allocated len */
> @@ -1266,6 +1268,7 @@ static void multifd_recv_terminate_threads(Error *err)
> MultiFDRecvParams *p = &multifd_recv_state->params[i];
>
> qemu_mutex_lock(&p->mutex);
> + p->quit = true;
> /* We could arrive here for two reasons:
> - normal quit, i.e. everything went fine, just finished
> - error quit: We close the channels so the channel threads
> @@ -1288,6 +1291,7 @@ int multifd_load_cleanup(Error **errp)
> MultiFDRecvParams *p = &multifd_recv_state->params[i];
>
> if (p->running) {
> + p->quit = true;
> qemu_thread_join(&p->thread);
> }
> object_unref(OBJECT(p->c));
> @@ -1351,6 +1355,10 @@ static void *multifd_recv_thread(void *opaque)
> uint32_t used;
> uint32_t flags;
>
> + if (p->quit) {
> + break;
> + }
> +
> ret = qio_channel_read_all_eof(p->c, (void *)p->packet,
> p->packet_len, &local_err);
> if (ret == 0) { /* EOF */
> @@ -1422,6 +1430,7 @@ int multifd_load_setup(void)
>
> qemu_mutex_init(&p->mutex);
> qemu_sem_init(&p->sem_sync, 0);
> + p->quit = false;
> p->id = i;
> p->pages = multifd_pages_init(page_count);
> p->packet_len = sizeof(MultiFDPacket_t)
> --
> 2.21.0
>
--
Dr. David Alan Gilbert / dgilbert@xxxxxxxxxx / Manchester, UK
