From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:58860) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1REku7-0006LV-Nx for qemu-devel@nongnu.org; Fri, 14 Oct 2011 12:46:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1REku6-0001EH-3t for qemu-devel@nongnu.org; Fri, 14 Oct 2011 12:46:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49007) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1REku5-0001E5-Q4 for qemu-devel@nongnu.org; Fri, 14 Oct 2011 12:46:38 -0400 From: Kevin Wolf Date: Fri, 14 Oct 2011 18:49:07 +0200 Message-Id: <1318610959-17971-13-git-send-email-kwolf@redhat.com> In-Reply-To: <1318610959-17971-1-git-send-email-kwolf@redhat.com> References: <1318610959-17971-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 12/24] block: directly invoke .bdrv_aio_*() in bdrv_co_io_em() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Stefan Hajnoczi We will unify block layer request processing across sync, aio, and coroutines and this means a .bdrv_co_*() emulation function should not call back into the public interface. There's no need here, just call .bdrv_aio_*() directly. The gory details: bdrv_co_io_em() cannot call back into the public bdrv_aio_*() interface since that will be handled using coroutines, which causes us to call into bdrv_co_io_em() again in an infinite loop :). Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- block.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index 25b03dd..09f8aad 100644 --- a/block.c +++ b/block.c @@ -3011,11 +3011,11 @@ static int coroutine_fn bdrv_co_io_em(BlockDriverState *bs, int64_t sector_num, BlockDriverAIOCB *acb; if (is_write) { - acb = bdrv_aio_writev(bs, sector_num, iov, nb_sectors, - bdrv_co_io_em_complete, &co); + acb = bs->drv->bdrv_aio_writev(bs, sector_num, iov, nb_sectors, + bdrv_co_io_em_complete, &co); } else { - acb = bdrv_aio_readv(bs, sector_num, iov, nb_sectors, - bdrv_co_io_em_complete, &co); + acb = bs->drv->bdrv_aio_readv(bs, sector_num, iov, nb_sectors, + bdrv_co_io_em_complete, &co); } trace_bdrv_co_io_em(bs, sector_num, nb_sectors, is_write, acb); -- 1.7.6.4