@@ -488,14 +488,10 @@ typedef struct {
QemuThread thread;
/* communication channel */
QIOChannel *c;
- /* sem where to wait for more work */
- QemuSemaphore sem;
/* this mutex protects the following parameters */
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 */
@@ -1001,8 +997,8 @@ static void multifd_recv_terminate_threads(Error *err)
MultiFDRecvParams *p = &multifd_recv_state->params[i];
qemu_mutex_lock(&p->mutex);
- p->quit = true;
- qemu_sem_post(&p->sem);
+ object_unref(OBJECT(p->c));
+ p->c = NULL;
qemu_mutex_unlock(&p->mutex);
}
}
@@ -1025,7 +1021,6 @@ int multifd_load_cleanup(Error **errp)
object_unref(OBJECT(p->c));
p->c = NULL;
qemu_mutex_destroy(&p->mutex);
- qemu_sem_destroy(&p->sem);
qemu_sem_destroy(&p->sem_sync);
g_free(p->name);
p->name = NULL;
@@ -1148,9 +1143,7 @@ int multifd_load_setup(void)
MultiFDRecvParams *p = &multifd_recv_state->params[i];
qemu_mutex_init(&p->mutex);
- qemu_sem_init(&p->sem, 0);
qemu_sem_init(&p->sem_sync, 0);
- p->quit = false;
p->id = i;
multifd_pages_init(&p->pages, page_count);
p->packet_len = sizeof(MultiFDPacket_t)
We know quit closing the QIO. Signed-off-by: Juan Quintela <quintela@redhat.com> --- migration/ram.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)