From patchwork Mon Feb 3 15:02:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Beno=C3=AEt_Canet?= X-Patchwork-Id: 316178 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 752982C0091 for ; Tue, 4 Feb 2014 02:10:03 +1100 (EST) Received: from localhost ([::1]:47855 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WAL9s-0005Le-Nu for incoming@patchwork.ozlabs.org; Mon, 03 Feb 2014 10:10:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54943) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WAL32-0005fh-FO for qemu-devel@nongnu.org; Mon, 03 Feb 2014 10:03:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WAL2t-0000s4-SV for qemu-devel@nongnu.org; Mon, 03 Feb 2014 10:02:56 -0500 Received: from paradis.irqsave.net ([62.212.105.220]:48941) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WAL2t-0000rd-HG for qemu-devel@nongnu.org; Mon, 03 Feb 2014 10:02:47 -0500 Received: from localhost.localdomain (laure.irqsave.net [192.168.77.2]) by paradis.irqsave.net (Postfix) with ESMTP id E32C55EAB7; Mon, 3 Feb 2014 16:36:10 +0100 (CET) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Mon, 3 Feb 2014 16:02:13 +0100 Message-Id: <1391439741-29078-6-git-send-email-benoit.canet@irqsave.net> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1391439741-29078-1-git-send-email-benoit.canet@irqsave.net> References: <1391439741-29078-1-git-send-email-benoit.canet@irqsave.net> MIME-Version: 1.0 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, mreitz@redhat.com Subject: [Qemu-devel] [PATCH V11 05/13] 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 From: Benoît Canet Signed-off-by: Benoit Canet Reviewed-by: Max Reitz --- 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 = 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; 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); } +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, };