From patchwork Tue Aug 14 14:14:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit Canet X-Patchwork-Id: 177298 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 804EC2C0088 for ; Wed, 15 Aug 2012 00:44:25 +1000 (EST) Received: from localhost ([::1]:57654 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1HuG-0000wY-IO for incoming@patchwork.ozlabs.org; Tue, 14 Aug 2012 10:15:40 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47502) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1HtB-00079D-Lc for qemu-devel@nongnu.org; Tue, 14 Aug 2012 10:14:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1Ht5-0004OC-OZ for qemu-devel@nongnu.org; Tue, 14 Aug 2012 10:14:33 -0400 Received: from mail-we0-f173.google.com ([74.125.82.173]:39789) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1Ht5-0004Nn-I4 for qemu-devel@nongnu.org; Tue, 14 Aug 2012 10:14:27 -0400 Received: by mail-we0-f173.google.com with SMTP id z53so285144wey.4 for ; Tue, 14 Aug 2012 07:14:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=Lne74KGsrQR+WY2r4vAq+77qr9L4o2X9l770O+vJrsE=; b=m/4TfwZ54mXlHR4nl54QsEGSWDtKybbjS6vJpe1ofyqPVOe8+/gqv2Q4XQPxSZKG2B TwR1YCJQ7OP5zHuANJTBnNPnr/whxtTZLuPlcoPU//QpdaR1Tw263Il098WI5kJLtIjh KhJ651Yv7Pqx733M+dcEJuicWDZUvedb38JNS5YX+8eHx2+294LDv7VFCqIFnW3HMdNc bEwPfjYyYUOViUbe1OIlT0krZtNtiABzFrPuBEDVjdNrWv+4k+9fjpT8mQ4hzvd5bmPm b+x/4OekExTQLtmQ9UWgtzMPYSyFf+MVdlTJymOro+c0XJwiWj+1E/4d/Cd8plfkvbed WXWA== Received: by 10.216.241.137 with SMTP id g9mr7354714wer.122.1344953667231; Tue, 14 Aug 2012 07:14:27 -0700 (PDT) Received: from Laure.box.in.irqsave.net (paradis.irqsave.net. [109.190.18.76]) by mx.google.com with ESMTPS id j6sm33013649wiy.4.2012.08.14.07.14.25 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 14 Aug 2012 07:14:26 -0700 (PDT) From: "=?UTF-8?q?Beno=C3=AEt=20Canet?=" To: qemu-devel@nongnu.org Date: Tue, 14 Aug 2012 16:14:10 +0200 Message-Id: <1344953651-16622-9-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1344953651-16622-1-git-send-email-benoit@irqsave.net> References: <1344953651-16622-1-git-send-email-benoit@irqsave.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.125.82.173 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?= Subject: [Qemu-devel] [RFC V3 8/9] quorum: Add quorum_aio_readv. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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); + } + + for (i = 0; i < s->m; 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, @@ -306,6 +338,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, };