From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50213) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VS6WD-0003bE-Ka for qemu-devel@nongnu.org; Fri, 04 Oct 2013 10:38:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VS6W8-0006jZ-K8 for qemu-devel@nongnu.org; Fri, 04 Oct 2013 10:38:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41705) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VS6W8-0006jU-1t for qemu-devel@nongnu.org; Fri, 04 Oct 2013 10:38:08 -0400 Message-ID: <524ED2CB.40804@redhat.com> Date: Fri, 04 Oct 2013 16:38:03 +0200 From: Max Reitz MIME-Version: 1.0 References: <1380717564-11098-1-git-send-email-benoit@irqsave.net> <1380717564-11098-6-git-send-email-benoit@irqsave.net> In-Reply-To: <1380717564-11098-6-git-send-email-benoit@irqsave.net> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH V9 05/11] quorum: Add quorum_aio_readv. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?ISO-8859-15?Q?Beno=EEt_Canet?= Cc: kwolf@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com On 2013-10-02 14:39, Beno=EEt Canet wrote: > 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 b49e3c6..f0fc0e9 100644 > --- a/block/quorum.c > +++ b/block/quorum.c > @@ -101,14 +101,23 @@ static int quorum_get_first_error(QuorumAIOCB *ac= b) > 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_fir= st_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; i < s->total; i++) { > + qemu_iovec_destroy(&acb->aios[i].qiov); As far as I see it, these fields are not really initialized for quorum=20 writes. Should we check for is_read before destroying them? (Although it=20 doesn't seem to hurt this way either) Max > + } > 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