From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59234) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bujuJ-00054N-K8 for qemu-devel@nongnu.org; Thu, 13 Oct 2016 13:35:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bujuE-0004DD-U3 for qemu-devel@nongnu.org; Thu, 13 Oct 2016 13:35:03 -0400 From: Paolo Bonzini Date: Thu, 13 Oct 2016 19:34:16 +0200 Message-Id: <1476380062-18001-13-git-send-email-pbonzini@redhat.com> In-Reply-To: <1476380062-18001-1-git-send-email-pbonzini@redhat.com> References: <1476380062-18001-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 12/18] iothread: detach all block devices before stopping them List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, famz@redhat.com, kwolf@redhat.com, stefanha@redhat.com Soon bdrv_drain will not call aio_poll itself on iothreads. If block devices are left hanging off the iothread's AioContext, there will be no one to do I/O for those poor devices. Signed-off-by: Paolo Bonzini --- iothread.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/iothread.c b/iothread.c index 62c8796..8153e21 100644 --- a/iothread.c +++ b/iothread.c @@ -16,6 +16,7 @@ #include "qom/object_interfaces.h" #include "qemu/module.h" #include "block/aio.h" +#include "block/block.h" #include "sysemu/iothread.h" #include "qmp-commands.h" #include "qemu/error-report.h" @@ -199,6 +200,15 @@ IOThreadInfoList *qmp_query_iothreads(Error **errp) void iothread_stop_all(void) { Object *container = object_get_objects_root(); + BlockDriverState *bs; + BdrvNextIterator it; + + for (bs = bdrv_first(&it); bs; bs = bdrv_next(&it)) { + AioContext *ctx = bdrv_get_aio_context(bs); + aio_context_acquire(ctx); + bdrv_set_aio_context(bs, qemu_get_aio_context()); + aio_context_release(ctx); + } object_child_foreach(container, iothread_stop, NULL); } -- 2.7.4