From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36556) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwsSv-0006bF-TW for qemu-devel@nongnu.org; Thu, 02 Aug 2012 06:17:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SwsSu-00040Y-QQ for qemu-devel@nongnu.org; Thu, 02 Aug 2012 06:17:13 -0400 Received: from mail-we0-f173.google.com ([74.125.82.173]:57525) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwsSu-0003xy-Jr for qemu-devel@nongnu.org; Thu, 02 Aug 2012 06:17:12 -0400 Received: by mail-we0-f173.google.com with SMTP id z53so5687350wey.4 for ; Thu, 02 Aug 2012 03:17:12 -0700 (PDT) From: "=?UTF-8?q?Beno=C3=AEt=20Canet?=" Date: Thu, 2 Aug 2012 12:16:42 +0200 Message-Id: <1343902604-13981-11-git-send-email-benoit@irqsave.net> In-Reply-To: <1343902604-13981-1-git-send-email-benoit@irqsave.net> References: <1343902604-13981-1-git-send-email-benoit@irqsave.net> Subject: [Qemu-devel] [RFC 10/12] qorum: Add qorum_aio_readv. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, stefanha@linux.vnet.ibm.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= Signed-off-by: Benoit Canet --- block/qorum.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/block/qorum.c b/block/qorum.c index eeffac2..772d138 100644 --- a/block/qorum.c +++ b/block/qorum.c @@ -175,6 +175,14 @@ static int qorum_check_ret(QorumAIOCB *acb) static void qorum_aio_bh(void *opaque) { QorumAIOCB *acb = opaque; + int i; + + for (i = 0; i <= 2; i++) { + if (acb->aios[i].buf) { + g_free(acb->aios[i].buf); + acb->aios[i].buf = NULL; + } + } qemu_bh_delete(acb->bh); acb->common.cb(acb->common.opaque, qorum_check_ret(acb)); @@ -227,6 +235,32 @@ static void qorum_aio_cb(void *opaque, int ret) } } +static BlockDriverAIOCB *qorum_aio_readv(BlockDriverState *bs, + int64_t sector_num, + QEMUIOVector *qiov, + int nb_sectors, + BlockDriverCompletionFunc *cb, + void *opaque) +{ + BDRVQorumState *s = bs->opaque; + QorumAIOCB *acb = qorum_aio_get(bs, qiov, true, sector_num, + nb_sectors, cb, opaque); + int i; + + for (i = 0; i <= 2; i++) { + acb->aios[i].buf = qemu_blockalign(bs->file, qiov->size); + qemu_iovec_init(&acb->qiovs[i], qiov->niov); + blkverify_iovec_clone(&acb->qiovs[i], qiov, acb->aios[i].buf); + } + + for (i = 0; i <= 2; i++) { + bdrv_aio_readv(s->bs[i], sector_num, qiov, nb_sectors, + qorum_aio_cb, &acb->aios[i]); + } + + return &acb->common; +} + static BlockDriverAIOCB *qorum_aio_writev(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, @@ -275,6 +309,7 @@ static BlockDriver bdrv_qorum = { .bdrv_close = qorum_close, .bdrv_co_flush_to_disk = qorum_co_flush, + .bdrv_aio_readv = qorum_aio_readv, .bdrv_aio_writev = qorum_aio_writev, }; -- 1.7.9.5