From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55713) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YH6Zt-0007Uf-Oo for qemu-devel@nongnu.org; Fri, 30 Jan 2015 03:05:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YH6Zp-0006YL-0b for qemu-devel@nongnu.org; Fri, 30 Jan 2015 03:05:21 -0500 Received: from [59.151.112.132] (port=62010 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YH6Zo-0006XP-Gs for qemu-devel@nongnu.org; Fri, 30 Jan 2015 03:05:16 -0500 Message-ID: <54CB3BB4.80406@cn.fujitsu.com> Date: Fri, 30 Jan 2015 16:07:16 +0800 From: Wen Congyang MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] quorum: don't share qiov List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devl , Kevin Wolf , Stefan Hajnoczi If the child touches qiov->iov, it will cause unexpected results. Signed-off-by: Wen Congyang --- block/quorum.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/block/quorum.c b/block/quorum.c index cdc026c..ef0c1e9 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -165,6 +165,10 @@ static void quorum_aio_finalize(QuorumAIOCB *acb) qemu_vfree(acb->qcrs[i].buf); qemu_iovec_destroy(&acb->qcrs[i].qiov); } + } else { + for (i = 0; i <= acb->child_iter; i++) { + qemu_iovec_destroy(&acb->qcrs[i].qiov); + } } g_free(acb->qcrs); @@ -709,8 +713,12 @@ static BlockAIOCB *quorum_aio_writev(BlockDriverState *bs, cb, opaque); int i; + acb->child_iter = s->num_children - 1; for (i = 0; i < s->num_children; i++) { - acb->qcrs[i].aiocb = bdrv_aio_writev(s->bs[i], sector_num, qiov, + qemu_iovec_init(&acb->qcrs[i].qiov, acb->qiov->niov); + qemu_iovec_concat(&acb->qcrs[i].qiov, acb->qiov, 0, acb->qiov->size); + acb->qcrs[i].aiocb = bdrv_aio_writev(s->bs[i], sector_num, + &acb->qcrs[i].qiov, nb_sectors, &quorum_aio_cb, &acb->qcrs[i]); } -- 2.1.0