mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-07-22 10:55:31 +00:00
iothread: create main loop unconditionally
Since we've have the gcontext always there, create the main loop altogether. The iothread_run() is even cleaner. Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Peter Xu <peterx@redhat.com> Message-id: 20190306115532.23025-4-peterx@redhat.com Message-Id: <20190306115532.23025-4-peterx@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
parent
b506e0f16c
commit
0bd2d233c6
12
iothread.c
12
iothread.c
|
@ -66,17 +66,8 @@ static void *iothread_run(void *opaque)
|
||||||
* changed in previous aio_poll()
|
* changed in previous aio_poll()
|
||||||
*/
|
*/
|
||||||
if (iothread->running && atomic_read(&iothread->run_gcontext)) {
|
if (iothread->running && atomic_read(&iothread->run_gcontext)) {
|
||||||
GMainLoop *loop;
|
|
||||||
|
|
||||||
g_main_context_push_thread_default(iothread->worker_context);
|
g_main_context_push_thread_default(iothread->worker_context);
|
||||||
iothread->main_loop =
|
|
||||||
g_main_loop_new(iothread->worker_context, TRUE);
|
|
||||||
loop = iothread->main_loop;
|
|
||||||
|
|
||||||
g_main_loop_run(iothread->main_loop);
|
g_main_loop_run(iothread->main_loop);
|
||||||
iothread->main_loop = NULL;
|
|
||||||
g_main_loop_unref(loop);
|
|
||||||
|
|
||||||
g_main_context_pop_thread_default(iothread->worker_context);
|
g_main_context_pop_thread_default(iothread->worker_context);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -141,6 +132,8 @@ static void iothread_instance_finalize(Object *obj)
|
||||||
if (iothread->worker_context) {
|
if (iothread->worker_context) {
|
||||||
g_main_context_unref(iothread->worker_context);
|
g_main_context_unref(iothread->worker_context);
|
||||||
iothread->worker_context = NULL;
|
iothread->worker_context = NULL;
|
||||||
|
g_main_loop_unref(iothread->main_loop);
|
||||||
|
iothread->main_loop = NULL;
|
||||||
}
|
}
|
||||||
qemu_sem_destroy(&iothread->init_done_sem);
|
qemu_sem_destroy(&iothread->init_done_sem);
|
||||||
}
|
}
|
||||||
|
@ -153,6 +146,7 @@ static void iothread_init_gcontext(IOThread *iothread)
|
||||||
source = aio_get_g_source(iothread_get_aio_context(iothread));
|
source = aio_get_g_source(iothread_get_aio_context(iothread));
|
||||||
g_source_attach(source, iothread->worker_context);
|
g_source_attach(source, iothread->worker_context);
|
||||||
g_source_unref(source);
|
g_source_unref(source);
|
||||||
|
iothread->main_loop = g_main_loop_new(iothread->worker_context, TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void iothread_complete(UserCreatable *obj, Error **errp)
|
static void iothread_complete(UserCreatable *obj, Error **errp)
|
||||||
|
|
Loading…
Reference in a new issue