From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:33161) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RBLjp-0007HI-Jn for qemu-devel@nongnu.org; Wed, 05 Oct 2011 03:18:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RBLjo-0006Fo-3v for qemu-devel@nongnu.org; Wed, 05 Oct 2011 03:17:57 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:42322) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RBLjn-0006EG-Sl for qemu-devel@nongnu.org; Wed, 05 Oct 2011 03:17:56 -0400 Received: by mail-ww0-f53.google.com with SMTP id 14so1759680wwg.10 for ; Wed, 05 Oct 2011 00:17:55 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 5 Oct 2011 09:17:37 +0200 Message-Id: <1317799065-29668-8-git-send-email-pbonzini@redhat.com> In-Reply-To: <1317799065-29668-1-git-send-email-pbonzini@redhat.com> References: <1317799065-29668-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v3 07/15] block: add bdrv_co_flush support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- block.c | 45 +++++++++++++++++++++++++++++++++++---------- block_int.h | 1 + 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/block.c b/block.c index 394ecaf..f4b9089 100644 --- a/block.c +++ b/block.c @@ -66,6 +66,8 @@ static BlockDriverAIOCB *bdrv_co_aio_readv_em(BlockDriverState *bs, static BlockDriverAIOCB *bdrv_co_aio_writev_em(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, BlockDriverCompletionFunc *cb, void *opaque); +static BlockDriverAIOCB *bdrv_co_aio_flush_em(BlockDriverState *bs, + BlockDriverCompletionFunc *cb, void *opaque); static int coroutine_fn bdrv_co_readv_em(BlockDriverState *bs, int64_t sector_num, int nb_sectors, QEMUIOVector *iov); @@ -199,7 +201,11 @@ void bdrv_register(BlockDriver *bdrv) } } - if (!bdrv->bdrv_aio_flush) { + if (bdrv->bdrv_co_flush) { + bdrv->bdrv_aio_flush = bdrv_co_aio_flush_em; + } else if (bdrv->bdrv_aio_flush) { + bdrv->bdrv_co_flush = bdrv_co_flush_em; + } else { bdrv->bdrv_aio_flush = bdrv_aio_flush_em; } @@ -1035,11 +1041,6 @@ static inline bool bdrv_has_async_rw(BlockDriver *drv) || drv->bdrv_aio_readv != bdrv_aio_readv_em; } -static inline bool bdrv_has_async_flush(BlockDriver *drv) -{ - return drv->bdrv_aio_flush != bdrv_aio_flush_em; -} - /* return < 0 if error. See bdrv_write() for the return codes */ int bdrv_read(BlockDriverState *bs, int64_t sector_num, uint8_t *buf, int nb_sectors) @@ -1742,8 +1743,8 @@ int bdrv_flush(BlockDriverState *bs) return 0; } - if (bs->drv && bdrv_has_async_flush(bs->drv) && qemu_in_coroutine()) { - return bdrv_co_flush_em(bs); + if (bs->drv && bs->drv->bdrv_co_flush && qemu_in_coroutine()) { + return bs->drv->bdrv_co_flush(bs); } if (bs->drv && bs->drv->bdrv_flush) { @@ -2764,7 +2765,7 @@ static AIOPool bdrv_em_co_aio_pool = { .cancel = bdrv_aio_co_cancel_em, }; -static void bdrv_co_rw_bh(void *opaque) +static void bdrv_co_em_bh(void *opaque) { BlockDriverAIOCBCoroutine *acb = opaque; @@ -2786,7 +2787,7 @@ static void coroutine_fn bdrv_co_rw(void *opaque) acb->req.nb_sectors, acb->req.qiov); } - acb->bh = qemu_bh_new(bdrv_co_rw_bh, acb); + acb->bh = qemu_bh_new(bdrv_co_em_bh, acb); qemu_bh_schedule(acb->bh); } @@ -2829,6 +2830,30 @@ static BlockDriverAIOCB *bdrv_co_aio_writev_em(BlockDriverState *bs, true); } +static void coroutine_fn bdrv_co_flush(void *opaque) +{ + BlockDriverAIOCBCoroutine *acb = opaque; + BlockDriverState *bs = acb->common.bs; + + acb->req.error = bs->drv->bdrv_co_flush(bs); + acb->bh = qemu_bh_new(bdrv_co_em_bh, acb); + qemu_bh_schedule(acb->bh); +} + +static BlockDriverAIOCB *bdrv_co_aio_flush_em(BlockDriverState *bs, + BlockDriverCompletionFunc *cb, + void *opaque) +{ + Coroutine *co; + BlockDriverAIOCBCoroutine *acb; + + acb = qemu_aio_get(&bdrv_em_co_aio_pool, bs, cb, opaque); + co = qemu_coroutine_create(bdrv_co_flush); + qemu_coroutine_enter(co, acb); + + return &acb->common; +} + static BlockDriverAIOCB *bdrv_aio_flush_em(BlockDriverState *bs, BlockDriverCompletionFunc *cb, void *opaque) { diff --git a/block_int.h b/block_int.h index 8c3b863..bb39b0b 100644 --- a/block_int.h +++ b/block_int.h @@ -83,6 +83,7 @@ struct BlockDriver { int64_t sector_num, int nb_sectors, QEMUIOVector *qiov); int coroutine_fn (*bdrv_co_writev)(BlockDriverState *bs, int64_t sector_num, int nb_sectors, QEMUIOVector *qiov); + int coroutine_fn (*bdrv_co_flush)(BlockDriverState *bs); int (*bdrv_aio_multiwrite)(BlockDriverState *bs, BlockRequest *reqs, int num_reqs); -- 1.7.6