From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YprJo-0000AK-1Y for qemu-devel@nongnu.org; Wed, 06 May 2015 00:52:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YprJm-0003z9-Rq for qemu-devel@nongnu.org; Wed, 06 May 2015 00:52:23 -0400 From: Fam Zheng Date: Wed, 6 May 2015 12:52:03 +0800 Message-Id: <1430887928-18189-2-git-send-email-famz@redhat.com> In-Reply-To: <1430887928-18189-1-git-send-email-famz@redhat.com> References: <1430887928-18189-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v2 1/6] mirror: Discard target sectors if not allocated at source side List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , qemu-block@nongnu.org, Stefan Hajnoczi , pbonzini@redhat.com, jsnow@redhat.com, wangxiaolong@ucloud.cn If guest discards a source cluster during mirror, we would want to discard target side as well. Signed-off-by: Fam Zheng --- block/mirror.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index 58f391a..37a5b61 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -163,6 +163,7 @@ static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s) int64_t end, sector_num, next_chunk, next_sector, hbitmap_next_sector; uint64_t delay_ns = 0; MirrorOp *op; + int pnum; s->sector_num = hbitmap_iter_next(&s->hbi); if (s->sector_num < 0) { @@ -289,8 +290,15 @@ static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s) s->in_flight++; s->sectors_in_flight += nb_sectors; trace_mirror_one_iteration(s, sector_num, nb_sectors); - bdrv_aio_readv(source, sector_num, &op->qiov, nb_sectors, - mirror_read_complete, op); + + if (!bdrv_is_allocated_above(source, NULL, sector_num, + nb_sectors, &pnum)) { + bdrv_aio_discard(s->target, sector_num, nb_sectors, + mirror_write_complete, op); + } else { + bdrv_aio_readv(source, sector_num, &op->qiov, nb_sectors, + mirror_read_complete, op); + } return delay_ns; } -- 1.9.3