From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35127) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8BuQ-0004pD-WF for qemu-devel@nongnu.org; Tue, 28 Jan 2014 11:53:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W8BuH-00013J-CY for qemu-devel@nongnu.org; Tue, 28 Jan 2014 11:53:10 -0500 Received: from paradis.irqsave.net ([62.212.105.220]:48540) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8BuG-00012X-RA for qemu-devel@nongnu.org; Tue, 28 Jan 2014 11:53:01 -0500 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Tue, 28 Jan 2014 17:52:46 +0100 Message-Id: <1390927974-31325-6-git-send-email-benoit.canet@irqsave.net> In-Reply-To: <1390927974-31325-1-git-send-email-benoit.canet@irqsave.net> References: <1390927974-31325-1-git-send-email-benoit.canet@irqsave.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH V10 05/13] 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, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com, mreitz@redhat.com From: Beno=C3=AEt Canet Signed-off-by: Benoit Canet --- block/quorum.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/block/quorum.c b/block/quorum.c index 85992ab..5bf37b3 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -101,14 +101,23 @@ static int quorum_get_first_error(QuorumAIOCB *acb) static void quorum_aio_finalize(QuorumAIOCB *acb) { BDRVQuorumState *s =3D acb->bqs; - int ret; + int i, ret; =20 ret =3D s->threshold <=3D acb->success_count ? 0 : quorum_get_first_= error(acb); =20 + for (i =3D 0; i < s->total; i++) { + qemu_vfree(acb->aios[i].buf); + acb->aios[i].buf =3D NULL; + acb->aios[i].ret =3D 0; + } + acb->common.cb(acb->common.opaque, ret); if (acb->finished) { *acb->finished =3D true; } + for (i =3D 0; acb->is_read && i < s->total; i++) { + qemu_iovec_destroy(&acb->aios[i].qiov); + } g_free(acb->aios); qemu_aio_release(acb); } @@ -164,6 +173,34 @@ static void quorum_aio_cb(void *opaque, int ret) quorum_aio_finalize(acb); } =20 +static BlockDriverAIOCB *quorum_aio_readv(BlockDriverState *bs, + int64_t sector_num, + QEMUIOVector *qiov, + int nb_sectors, + BlockDriverCompletionFunc *cb, + void *opaque) +{ + BDRVQuorumState *s =3D bs->opaque; + QuorumAIOCB *acb =3D quorum_aio_get(s, bs, qiov, sector_num, + nb_sectors, cb, opaque); + int i; + + acb->is_read =3D true; + + for (i =3D 0; i < s->total; i++) { + acb->aios[i].buf =3D qemu_blockalign(bs->file, qiov->size); + qemu_iovec_init(&acb->aios[i].qiov, qiov->niov); + qemu_iovec_clone(&acb->aios[i].qiov, qiov, acb->aios[i].buf); + } + + for (i =3D 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, @@ -191,6 +228,7 @@ static BlockDriver bdrv_quorum =3D { =20 .instance_size =3D sizeof(BDRVQuorumState), =20 + .bdrv_aio_readv =3D quorum_aio_readv, .bdrv_aio_writev =3D quorum_aio_writev, }; =20 --=20 1.8.3.2