From patchwork Wed Oct 2 12:39:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Beno=C3=AEt_Canet?= X-Patchwork-Id: 279727 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 28D5E2C00B1 for ; Wed, 2 Oct 2013 22:42:46 +1000 (EST) Received: from localhost ([::1]:35843 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VRLlL-0001bn-Cn for incoming@patchwork.ozlabs.org; Wed, 02 Oct 2013 08:42:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55755) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VRLiu-0006vr-8A for qemu-devel@nongnu.org; Wed, 02 Oct 2013 08:40:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VRLim-0007EH-RW for qemu-devel@nongnu.org; Wed, 02 Oct 2013 08:40:12 -0400 Received: from nodalink.pck.nerim.net ([62.212.105.220]:42247 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VRLim-0007Cr-HS for qemu-devel@nongnu.org; Wed, 02 Oct 2013 08:40:04 -0400 Received: by paradis.irqsave.net (Postfix, from userid 1002) id C9D828746C0; Wed, 2 Oct 2013 14:40:03 +0200 (CEST) Received: from Laure.example.org (unknown [192.168.77.20]) by paradis.irqsave.net (Postfix) with ESMTP id 56ABF8746CA; Wed, 2 Oct 2013 14:39:25 +0200 (CEST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Wed, 2 Oct 2013 14:39:18 +0200 Message-Id: <1380717564-11098-6-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1380717564-11098-1-git-send-email-benoit@irqsave.net> References: <1380717564-11098-1-git-send-email-benoit@irqsave.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 62.212.105.220 Cc: kwolf@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com Subject: [Qemu-devel] [PATCH V9 05/11] 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 | 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 *acb) static void quorum_aio_finalize(QuorumAIOCB *acb) { BDRVQuorumState *s = acb->bqs; - int ret; + int i, ret; ret = s->threshold <= acb->success_count ? 0 : quorum_get_first_error(acb); + for (i = 0; i < s->total; i++) { + qemu_vfree(acb->aios[i].buf); + acb->aios[i].buf = NULL; + acb->aios[i].ret = 0; + } + acb->common.cb(acb->common.opaque, ret); if (acb->finished) { *acb->finished = true; } + for (i = 0; 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); } +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; + + acb->is_read = true; + + for (i = 0; i < s->total; i++) { + acb->aios[i].buf = 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 = 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 = { .instance_size = sizeof(BDRVQuorumState), + .bdrv_aio_readv = quorum_aio_readv, .bdrv_aio_writev = quorum_aio_writev, };