From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1bEq-0005kP-00 for qemu-devel@nongnu.org; Wed, 15 Aug 2012 06:54:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1bEo-0005Hu-Ro for qemu-devel@nongnu.org; Wed, 15 Aug 2012 06:54:11 -0400 Received: from e06smtp11.uk.ibm.com ([195.75.94.107]:49753) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1bEo-0005Hn-Jc for qemu-devel@nongnu.org; Wed, 15 Aug 2012 06:54:10 -0400 Received: from /spool/local by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 15 Aug 2012 11:54:09 +0100 Received: from d06av09.portsmouth.uk.ibm.com (d06av09.portsmouth.uk.ibm.com [9.149.37.250]) by b06cxnps4074.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q7FArn7G27525336 for ; Wed, 15 Aug 2012 10:53:49 GMT Received: from d06av09.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av09.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q7FArrlr010927 for ; Wed, 15 Aug 2012 04:53:54 -0600 Date: Wed, 15 Aug 2012 11:53:51 +0100 From: Stefan Hajnoczi Message-ID: <20120815105351.GH27481@stefanha-thinkpad.localdomain> References: <1344953651-16622-1-git-send-email-benoit@irqsave.net> <1344953651-16622-9-git-send-email-benoit@irqsave.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1344953651-16622-9-git-send-email-benoit@irqsave.net> Subject: Re: [Qemu-devel] [RFC V3 8/9] quorum: Add quorum_aio_readv. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?iso-8859-1?Q?Beno=EEt?= Canet Cc: kwolf@redhat.com, =?iso-8859-1?Q?Beno=EEt?= Canet , qemu-devel@nongnu.org, blauwirbel@gmail.com, anthony@codemonkey.ws, pbonzini@redhat.com, eblake@redhat.com, afaerber@suse.de On Tue, Aug 14, 2012 at 04:14:10PM +0200, Benoît Canet wrote: > Signed-off-by: Benoit Canet > --- > block/quorum.c | 35 ++++++++++++++++++++++++++++++++++- > 1 file changed, 34 insertions(+), 1 deletion(-) > > diff --git a/block/quorum.c b/block/quorum.c > index 86962b4..8b449fb 100644 > --- a/block/quorum.c > +++ b/block/quorum.c > @@ -190,10 +190,16 @@ static void quorum_aio_bh(void *opaque) > { > QuorumAIOCB *acb = opaque; > BDRVQuorumState *s = acb->bqs; > - int ret; > + int i, ret; > > ret = s->n <= acb->success_count ? 0 : -EIO; > > + for (i = 0; i < s->m; 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) { > @@ -258,6 +264,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->m; 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); > + } Need to call qemu_iovec_destroy() to free &acb->qiovs[i] iovecs. Stefan