From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49578) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WswnE-0004sK-6S for qemu-devel@nongnu.org; Fri, 06 Jun 2014 12:15:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wswn9-0004UQ-3P for qemu-devel@nongnu.org; Fri, 06 Jun 2014 12:15:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9638) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wswn8-0004UD-SM for qemu-devel@nongnu.org; Fri, 06 Jun 2014 12:14:55 -0400 From: Stefan Hajnoczi Date: Fri, 6 Jun 2014 18:13:40 +0200 Message-Id: <1402071243-16702-20-git-send-email-stefanha@redhat.com> In-Reply-To: <1402071243-16702-1-git-send-email-stefanha@redhat.com> References: <1402071243-16702-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 19/42] rbd: use BlockDriverState's AioContext List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefan Hajnoczi , Josh Durgin 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 Signed-off-by: Stefan Hajnoczi Reviewed-by: Josh Durgin --- block/rbd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/block/rbd.c b/block/rbd.c index 09af484..a78760b 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -555,7 +555,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); @@ -588,7 +588,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.3