[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 01/10] qemu-img: convert: don't use unallocated_blocks_are_zer
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v3 01/10] qemu-img: convert: don't use unallocated_blocks_are_zero |
Date: |
Thu, 28 May 2020 12:43:56 +0300 |
qemu-img convert wants to distinguish ZERO which comes from short
backing files. unallocated_blocks_are_zero field of bdi is unrelated:
space after EOF is always considered to be zero anyway. So, just make
post_backing_zero true in case of short backing file.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
qemu-img.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 2d30682f12..9fcfafe470 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -1660,7 +1660,6 @@ typedef struct ImgConvertState {
BlockBackend *target;
bool has_zero_init;
bool compressed;
- bool unallocated_blocks_are_zero;
bool target_is_new;
bool target_has_backing;
int64_t target_backing_sectors; /* negative if unknown */
@@ -1705,7 +1704,7 @@ static int convert_iteration_sectors(ImgConvertState *s,
int64_t sector_num)
if (s->target_backing_sectors >= 0) {
if (sector_num >= s->target_backing_sectors) {
- post_backing_zero = s->unallocated_blocks_are_zero;
+ post_backing_zero = true;
} else if (sector_num + n > s->target_backing_sectors) {
/* Split requests around target_backing_sectors (because
* starting from there, zeros are handled differently) */
@@ -2610,7 +2609,6 @@ static int img_convert(int argc, char **argv)
} else {
s.compressed = s.compressed || bdi.needs_compressed_writes;
s.cluster_sectors = bdi.cluster_size / BDRV_SECTOR_SIZE;
- s.unallocated_blocks_are_zero = bdi.unallocated_blocks_are_zero;
}
ret = convert_do_copy(&s);
--
2.18.0
- [PATCH v3 00/10] drop unallocated_blocks_are_zero, Vladimir Sementsov-Ogievskiy, 2020/05/28
- [PATCH v3 02/10] block: inline bdrv_unallocated_blocks_are_zero(), Vladimir Sementsov-Ogievskiy, 2020/05/28
- [PATCH v3 01/10] qemu-img: convert: don't use unallocated_blocks_are_zero,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v3 03/10] block/vdi: return ZERO block-status when appropriate, Vladimir Sementsov-Ogievskiy, 2020/05/28
- [PATCH v3 04/10] block/vpc: return ZERO block-status when appropriate, Vladimir Sementsov-Ogievskiy, 2020/05/28
- [PATCH v3 05/10] block/crypto: drop unallocated_blocks_are_zero, Vladimir Sementsov-Ogievskiy, 2020/05/28
- [PATCH v3 06/10] block/iscsi: drop unallocated_blocks_are_zero, Vladimir Sementsov-Ogievskiy, 2020/05/28
- [PATCH v3 07/10] block/file-posix: drop unallocated_blocks_are_zero, Vladimir Sementsov-Ogievskiy, 2020/05/28
- [PATCH v3 08/10] block/vhdx: drop unallocated_blocks_are_zero, Vladimir Sementsov-Ogievskiy, 2020/05/28
- [PATCH v3 09/10] block: drop unallocated_blocks_are_zero, Vladimir Sementsov-Ogievskiy, 2020/05/28
- [PATCH v3 10/10] qed: Simplify backing reads, Vladimir Sementsov-Ogievskiy, 2020/05/28