From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59555) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VoyP9-00076k-0j for qemu-devel@nongnu.org; Fri, 06 Dec 2013 11:37:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VoyP3-0003MK-SS for qemu-devel@nongnu.org; Fri, 06 Dec 2013 11:37:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:23894) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VoyP3-0003M5-Jy for qemu-devel@nongnu.org; Fri, 06 Dec 2013 11:37:21 -0500 From: Stefan Hajnoczi Date: Fri, 6 Dec 2013 17:36:10 +0100 Message-Id: <1386347807-27359-12-git-send-email-stefanha@redhat.com> In-Reply-To: <1386347807-27359-1-git-send-email-stefanha@redhat.com> References: <1386347807-27359-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 11/48] block drivers: add discard/write_zeroes properties to bdrv_get_info implementation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Stefan Hajnoczi , Anthony Liguori From: Paolo Bonzini Signed-off-by: Paolo Bonzini Reviewed-by: Peter Lieven Signed-off-by: Stefan Hajnoczi --- block/qcow2.c | 2 ++ block/qed.c | 2 ++ block/vdi.c | 1 + block/vhdx.c | 3 +++ block/vpc.c | 1 + 5 files changed, 9 insertions(+) diff --git a/block/qcow2.c b/block/qcow2.c index 8e2b6c7..41e454a 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1893,6 +1893,8 @@ static coroutine_fn int qcow2_co_flush_to_os(BlockDriverState *bs) static int qcow2_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) { BDRVQcowState *s = bs->opaque; + bdi->unallocated_blocks_are_zero = true; + bdi->can_write_zeroes_with_unmap = (s->qcow_version >= 3); bdi->cluster_size = s->cluster_size; bdi->vm_state_offset = qcow2_vm_state_offset(s); return 0; diff --git a/block/qed.c b/block/qed.c index adc2736..59516a5 100644 --- a/block/qed.c +++ b/block/qed.c @@ -1475,6 +1475,8 @@ static int bdrv_qed_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) memset(bdi, 0, sizeof(*bdi)); bdi->cluster_size = s->header.cluster_size; bdi->is_dirty = s->header.features & QED_F_NEED_CHECK; + bdi->unallocated_blocks_are_zero = true; + bdi->can_write_zeroes_with_unmap = true; return 0; } diff --git a/block/vdi.c b/block/vdi.c index b6ec002..2d7490f 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -331,6 +331,7 @@ static int vdi_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) logout("\n"); bdi->cluster_size = s->block_size; bdi->vm_state_offset = 0; + bdi->unallocated_blocks_are_zero = true; return 0; } diff --git a/block/vhdx.c b/block/vhdx.c index ed6fa53..67bbe10 100644 --- a/block/vhdx.c +++ b/block/vhdx.c @@ -1049,6 +1049,9 @@ static int vhdx_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) bdi->cluster_size = s->block_size; + bdi->unallocated_blocks_are_zero = + (s->params.data_bits & VHDX_PARAMS_HAS_PARENT) == 0; + return 0; } diff --git a/block/vpc.c b/block/vpc.c index 551876f..1d326cb 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -464,6 +464,7 @@ static int vpc_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) bdi->cluster_size = s->block_size; } + bdi->unallocated_blocks_are_zero = true; return 0; } -- 1.8.4.2