[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 18/25] rbd: use BlockDriverState's AioContext
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH v2 18/25] rbd: use BlockDriverState's AioContext |
Date: |
Wed, 7 May 2014 12:27:34 +0200 |
Drop the assumption that we're using the main AioContext. Convert
qemu_bh_new() to aio_bh_new() and qemu_aio_wait() to aio_poll().
The .bdrv_detach_aio_context() and .bdrv_attach_aio_context() interfaces
are not needed since no fd handlers, timers, or BHs stay registered when
requests have been drained.
Cc: Josh Durgin <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/rbd.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/block/rbd.c b/block/rbd.c
index dbc79f4..41f7bdc 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -548,7 +548,7 @@ static void qemu_rbd_aio_cancel(BlockDriverAIOCB *blockacb)
acb->cancelled = 1;
while (acb->status == -EINPROGRESS) {
- qemu_aio_wait();
+ aio_poll(bdrv_get_aio_context(acb->common.bs), true);
}
qemu_aio_release(acb);
@@ -581,7 +581,8 @@ static void rbd_finish_aiocb(rbd_completion_t c, RADOSCB
*rcb)
rcb->ret = rbd_aio_get_return_value(c);
rbd_aio_release(c);
- acb->bh = qemu_bh_new(rbd_finish_bh, rcb);
+ acb->bh = aio_bh_new(bdrv_get_aio_context(acb->common.bs),
+ rbd_finish_bh, rcb);
qemu_bh_schedule(acb->bh);
}
--
1.9.0
- [Qemu-devel] [PATCH v2 14/25] block/raw-posix: implement .bdrv_detach/attach_aio_context(), (continued)
- [Qemu-devel] [PATCH v2 14/25] block/raw-posix: implement .bdrv_detach/attach_aio_context(), Stefan Hajnoczi, 2014/05/07
- [Qemu-devel] [PATCH v2 13/25] quorum: implement .bdrv_detach/attach_aio_context(), Stefan Hajnoczi, 2014/05/07
- [Qemu-devel] [PATCH v2 15/25] block/linux-aio: fix memory and fd leak, Stefan Hajnoczi, 2014/05/07
- [Qemu-devel] [PATCH v2 16/25] block/raw-win32: create one QEMUWin32AIOState per BDRVRawState, Stefan Hajnoczi, 2014/05/07
- [Qemu-devel] [PATCH v2 11/25] nfs: implement .bdrv_detach/attach_aio_context(), Stefan Hajnoczi, 2014/05/07
- [Qemu-devel] [PATCH v2 18/25] rbd: use BlockDriverState's AioContext,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH v2 17/25] block/raw-win32: implement .bdrv_detach/attach_aio_context(), Stefan Hajnoczi, 2014/05/07
- [Qemu-devel] [PATCH v2 20/25] ssh: use BlockDriverState's AioContext, Stefan Hajnoczi, 2014/05/07
- [Qemu-devel] [PATCH v2 21/25] vmdk: implement .bdrv_detach/attach_aio_context(), Stefan Hajnoczi, 2014/05/07
- [Qemu-devel] [PATCH v2 22/25] dataplane: use the QEMU block layer for I/O, Stefan Hajnoczi, 2014/05/07
- [Qemu-devel] [PATCH v2 23/25] dataplane: delete IOQueue since it is no longer used, Stefan Hajnoczi, 2014/05/07
- [Qemu-devel] [PATCH v2 24/25] dataplane: implement async flush, Stefan Hajnoczi, 2014/05/07
- [Qemu-devel] [PATCH v2 25/25] raw-posix: drop raw_get_aio_fd() since it is no longer used, Stefan Hajnoczi, 2014/05/07
- [Qemu-devel] [PATCH v2 19/25] sheepdog: implement .bdrv_detach/attach_aio_context(), Stefan Hajnoczi, 2014/05/07