From patchwork Thu Jan 17 15:51:32 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: 213315 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 E38FE2C0084 for ; Fri, 18 Jan 2013 02:52:01 +1100 (EST) Received: from localhost ([::1]:58961 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tvrl1-0003ME-WE for incoming@patchwork.ozlabs.org; Thu, 17 Jan 2013 10:52:00 -0500 Received: from eggs.gnu.org ([208.118.235.92]:34472) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tvrkk-00034X-1J for qemu-devel@nongnu.org; Thu, 17 Jan 2013 10:51:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tvrkh-0005pF-4i for qemu-devel@nongnu.org; Thu, 17 Jan 2013 10:51:41 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:44088 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tvrkg-0005p6-R5 for qemu-devel@nongnu.org; Thu, 17 Jan 2013 10:51:39 -0500 Received: by paradis.irqsave.net (Postfix, from userid 1002) id 631DE874305; Thu, 17 Jan 2013 17:23:37 +0100 (CET) Received: from localhost.localdomain (unknown [192.168.77.1]) by paradis.irqsave.net (Postfix) with ESMTP id 53CBA87431C; Thu, 17 Jan 2013 17:23:04 +0100 (CET) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Thu, 17 Jan 2013 16:51:32 +0100 Message-Id: <1358437897-24251-7-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1358437897-24251-1-git-send-email-benoit@irqsave.net> References: <1358437897-24251-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, pbonzini@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com Subject: [Qemu-devel] [RFC V6 06/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 | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/block/quorum.c b/block/quorum.c index cb95eab..98052eb 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -192,15 +192,24 @@ static void quorum_aio_bh(void *opaque) { QuorumAIOCB *acb = opaque; BDRVQuorumState *s = acb->bqs; - int ret; + int i, ret; ret = s->threshold <= acb->success_count ? 0 : -EIO; + for (i = 0; i < s->total; 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) { *acb->finished = true; } + for (i = 0; i < s->total; i++) { + qemu_iovec_destroy(&acb->qiovs[i]); + } g_free(acb->aios); g_free(acb->qiovs); qemu_aio_release(acb); @@ -261,6 +270,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->total; 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->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, @@ -291,6 +326,7 @@ static BlockDriver bdrv_quorum = { .bdrv_file_open = quorum_open, .bdrv_close = quorum_close, + .bdrv_aio_readv = quorum_aio_readv, .bdrv_aio_writev = quorum_aio_writev, };