From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34256) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T3QT4-0004lw-4G for qemu-devel@nongnu.org; Mon, 20 Aug 2012 07:48:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T3QT3-0004Dz-2x for qemu-devel@nongnu.org; Mon, 20 Aug 2012 07:48:26 -0400 Received: from mail-wg0-f53.google.com ([74.125.82.53]:54507) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T3QT2-0004D0-Ss for qemu-devel@nongnu.org; Mon, 20 Aug 2012 07:48:25 -0400 Received: by mail-wg0-f53.google.com with SMTP id fm10so4227117wgb.10 for ; Mon, 20 Aug 2012 04:48:24 -0700 (PDT) From: "=?UTF-8?q?Beno=C3=AEt=20Canet?=" Date: Mon, 20 Aug 2012 13:48:01 +0200 Message-Id: <1345463283-9684-8-git-send-email-benoit@irqsave.net> In-Reply-To: <1345463283-9684-1-git-send-email-benoit@irqsave.net> References: <1345463283-9684-1-git-send-email-benoit@irqsave.net> Subject: [Qemu-devel] [RFC V4 7/9] quorum: Add quorum_aio_readv. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@linux.vnet.ibm.com, blauwirbel@gmail.com, anthony@codemonkey.ws, pbonzini@redhat.com, eblake@redhat.com, afaerber@suse.de, =?UTF-8?q?Beno=C3=AEt=20Canet?= Signed-off-by: Benoit Canet --- block/quorum.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/block/quorum.c b/block/quorum.c index 092d1ea..95f4668 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -180,15 +180,24 @@ static void quorum_aio_bh(void *opaque) { QuorumAIOCB *acb = opaque; BDRVQuorumState *s = acb->bqs; - int ret; + int i, ret; ret = s->threshold <= acb->success_count ? 0 : -EIO; + for (i = 0; i < s->total; i++) { + qemu_vfree(acb->aios[i].buf); + acb->aios[i].buf = NULL; + acb->aios[i].ret = 0; + } + qemu_bh_delete(acb->bh); acb->common.cb(acb->common.opaque, ret); if (acb->finished) { *acb->finished = true; } + for (i = 0; i < s->total; i++) { + qemu_iovec_destroy(&acb->qiovs[i]); + } g_free(acb->aios); g_free(acb->qiovs); qemu_aio_release(acb); @@ -248,6 +257,32 @@ static void quorum_aio_cb(void *opaque, int ret) qemu_bh_schedule(acb->bh); } +static BlockDriverAIOCB *quorum_aio_readv(BlockDriverState *bs, + int64_t sector_num, + QEMUIOVector *qiov, + int nb_sectors, + BlockDriverCompletionFunc *cb, + void *opaque) +{ + BDRVQuorumState *s = bs->opaque; + QuorumAIOCB *acb = quorum_aio_get(s, bs, qiov, sector_num, + nb_sectors, cb, opaque); + int i; + + for (i = 0; i < s->total; i++) { + acb->aios[i].buf = qemu_blockalign(bs->file, qiov->size); + qemu_iovec_init(&acb->qiovs[i], qiov->niov); + qemu_iovec_clone(&acb->qiovs[i], qiov, acb->aios[i].buf); + } + + for (i = 0; i < s->total; i++) { + bdrv_aio_readv(s->bs[i], sector_num, qiov, nb_sectors, + quorum_aio_cb, &acb->aios[i]); + } + + return &acb->common; +} + static BlockDriverAIOCB *quorum_aio_writev(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, @@ -291,6 +326,7 @@ static BlockDriver bdrv_quorum = { .bdrv_close = quorum_close, .bdrv_co_flush_to_disk = quorum_co_flush, + .bdrv_aio_readv = quorum_aio_readv, .bdrv_aio_writev = quorum_aio_writev, }; -- 1.7.9.5