From a0710f7995f914e3044e5899bd8ff6c43c62f916 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 20 Feb 2015 17:26:52 +0100 Subject: iothread: release iothread around aio_poll This is the first step towards having fine-grained critical sections in dataplane threads, which resolves lock ordering problems between address_space_* functions (which need the BQL when doing MMIO, even after we complete RCU-based dispatch) and the AioContext. Because AioContext does not use contention callbacks anymore, the unit test has to be changed. Signed-off-by: Paolo Bonzini Reviewed-by: Stefan Hajnoczi Message-id: 1424449612-18215-4-git-send-email-pbonzini@redhat.com Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- iothread.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'iothread.c') diff --git a/iothread.c b/iothread.c index 342a23fcb0..a1f91099bc 100644 --- a/iothread.c +++ b/iothread.c @@ -31,21 +31,14 @@ typedef ObjectClass IOThreadClass; static void *iothread_run(void *opaque) { IOThread *iothread = opaque; - bool blocking; qemu_mutex_lock(&iothread->init_done_lock); iothread->thread_id = qemu_get_thread_id(); qemu_cond_signal(&iothread->init_done_cond); qemu_mutex_unlock(&iothread->init_done_lock); - while (!iothread->stopping) { - aio_context_acquire(iothread->ctx); - blocking = true; - while (!iothread->stopping && aio_poll(iothread->ctx, blocking)) { - /* Progress was made, keep going */ - blocking = false; - } - aio_context_release(iothread->ctx); + while (!atomic_read(&iothread->stopping)) { + aio_poll(iothread->ctx, true); } return NULL; } -- cgit v1.2.1