[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/20] iothread: detach all block devices before sto
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 12/20] iothread: detach all block devices before stopping them |
Date: |
Mon, 17 Oct 2016 15:54:22 +0200 |
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 <address@hidden>
---
v1->v2: add "if ... continue" [Fam]
iothread.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/iothread.c b/iothread.c
index 62c8796..fdfb440 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,18 @@ 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);
+ if (ctx == qemu_get_aio_context()) {
+ continue;
+ }
+ 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
- [Qemu-devel] [PATCH 02/20] blockjob: introduce .drain callback for jobs, (continued)
- [Qemu-devel] [PATCH 02/20] blockjob: introduce .drain callback for jobs, Paolo Bonzini, 2016/10/17
- [Qemu-devel] [PATCH 03/20] mirror: use bdrv_drained_begin/bdrv_drained_end, Paolo Bonzini, 2016/10/17
- [Qemu-devel] [PATCH 04/20] block: add BDS field to count in-flight requests, Paolo Bonzini, 2016/10/17
- [Qemu-devel] [PATCH 05/20] block: change drain to look only at one child at a time, Paolo Bonzini, 2016/10/17
- [Qemu-devel] [PATCH 06/20] qed: Implement .bdrv_drain, Paolo Bonzini, 2016/10/17
- [Qemu-devel] [PATCH 07/20] block: introduce BDRV_POLL_WHILE, Paolo Bonzini, 2016/10/17
- [Qemu-devel] [PATCH 09/20] nfs: use BDRV_POLL_WHILE, Paolo Bonzini, 2016/10/17
- [Qemu-devel] [PATCH 08/20] nfs: move nfs_set_events out of the while loops, Paolo Bonzini, 2016/10/17
- [Qemu-devel] [PATCH 11/20] aio: introduce qemu_get_current_aio_context, Paolo Bonzini, 2016/10/17
- [Qemu-devel] [PATCH 10/20] sheepdog: use BDRV_POLL_WHILE, Paolo Bonzini, 2016/10/17
- [Qemu-devel] [PATCH 12/20] iothread: detach all block devices before stopping them,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 13/20] replication: pass BlockDriverState to reopen_backing_file, Paolo Bonzini, 2016/10/17
- [Qemu-devel] [PATCH 14/20] block: prepare bdrv_reopen_multiple to release AioContext, Paolo Bonzini, 2016/10/17
- [Qemu-devel] [PATCH 15/20] qemu-io: acquire AioContext, Paolo Bonzini, 2016/10/17
- [Qemu-devel] [PATCH 16/20] qemu-img: call aio_context_acquire/release around block job, Paolo Bonzini, 2016/10/17
- [Qemu-devel] [PATCH 17/20] block: only call aio_poll on the current thread's AioContext, Paolo Bonzini, 2016/10/17
- [Qemu-devel] [PATCH 19/20] qemu-thread: introduce QemuRecMutex, Paolo Bonzini, 2016/10/17
- [Qemu-devel] [PATCH 18/20] iothread: release AioContext around aio_poll, Paolo Bonzini, 2016/10/17
- [Qemu-devel] [PATCH 20/20] aio: convert from RFifoLock to QemuRecMutex, Paolo Bonzini, 2016/10/17