[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/17] iotests: Test convert -n to pre-filled image
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PULL 11/17] iotests: Test convert -n to pre-filled image |
Date: |
Mon, 19 Aug 2019 18:17:17 +0200 |
Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: Maxim Levitsky <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/122 | 17 +++++++++++++++++
tests/qemu-iotests/122.out | 8 ++++++++
2 files changed, 25 insertions(+)
diff --git a/tests/qemu-iotests/122 b/tests/qemu-iotests/122
index 85c3a8d047..059011ebb1 100755
--- a/tests/qemu-iotests/122
+++ b/tests/qemu-iotests/122
@@ -257,6 +257,23 @@ for min_sparse in 4k 8k; do
$QEMU_IMG map --output=json "$TEST_IMG".orig | _filter_qemu_img_map
done
+
+echo
+echo '=== -n to a non-zero image ==='
+echo
+
+# Keep source zero
+_make_test_img 64M
+
+# Output is not zero, but has bdrv_has_zero_init() == 1
+TEST_IMG="$TEST_IMG".orig _make_test_img 64M
+$QEMU_IO -c "write -P 42 0 64k" "$TEST_IMG".orig | _filter_qemu_io
+
+# Convert with -n, which should not assume that the target is zeroed
+$QEMU_IMG convert -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG".orig
+
+$QEMU_IMG compare "$TEST_IMG" "$TEST_IMG".orig
+
# success, all done
echo '*** done'
rm -f $seq.full
diff --git a/tests/qemu-iotests/122.out b/tests/qemu-iotests/122.out
index c576705284..849b6cc2ef 100644
--- a/tests/qemu-iotests/122.out
+++ b/tests/qemu-iotests/122.out
@@ -220,4 +220,12 @@ convert -c -S 8k
{ "start": 9216, "length": 8192, "depth": 0, "zero": true, "data": false},
{ "start": 17408, "length": 1024, "depth": 0, "zero": false, "data": true},
{ "start": 18432, "length": 67090432, "depth": 0, "zero": true, "data": false}]
+
+=== -n to a non-zero image ===
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
+Formatting 'TEST_DIR/t.IMGFMT.orig', fmt=IMGFMT size=67108864
+wrote 65536/65536 bytes at offset 0
+64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+Images are identical.
*** done
--
2.21.0
- [Qemu-devel] [PULL 02/17] qemu-img: Fix bdrv_has_zero_init() use in convert, (continued)
- [Qemu-devel] [PULL 02/17] qemu-img: Fix bdrv_has_zero_init() use in convert, Max Reitz, 2019/08/19
- [Qemu-devel] [PULL 01/17] LUKS: support preallocation, Max Reitz, 2019/08/19
- [Qemu-devel] [PULL 03/17] mirror: Fix bdrv_has_zero_init() use, Max Reitz, 2019/08/19
- [Qemu-devel] [PULL 04/17] block: Add bdrv_has_zero_init_truncate(), Max Reitz, 2019/08/19
- [Qemu-devel] [PULL 05/17] block: Implement .bdrv_has_zero_init_truncate(), Max Reitz, 2019/08/19
- [Qemu-devel] [PULL 06/17] block: Use bdrv_has_zero_init_truncate(), Max Reitz, 2019/08/19
- [Qemu-devel] [PULL 07/17] qcow2: Fix .bdrv_has_zero_init(), Max Reitz, 2019/08/19
- [Qemu-devel] [PULL 08/17] vdi: Fix .bdrv_has_zero_init(), Max Reitz, 2019/08/19
- [Qemu-devel] [PULL 09/17] vhdx: Fix .bdrv_has_zero_init(), Max Reitz, 2019/08/19
- [Qemu-devel] [PULL 10/17] iotests: Convert to preallocated encrypted qcow2, Max Reitz, 2019/08/19
- [Qemu-devel] [PULL 11/17] iotests: Test convert -n to pre-filled image,
Max Reitz <=
- [Qemu-devel] [PULL 14/17] vmdk: Make block_status recurse for flat extents, Max Reitz, 2019/08/19
- [Qemu-devel] [PULL 15/17] vpc: Do not return RAW from block_status, Max Reitz, 2019/08/19
- [Qemu-devel] [PULL 13/17] vdi: Make block_status recurse for fixed images, Max Reitz, 2019/08/19
- [Qemu-devel] [PULL 17/17] doc: Preallocation does not require writing zeroes, Max Reitz, 2019/08/19
- [Qemu-devel] [PULL 12/17] iotests: Full mirror to existing non-zero image, Max Reitz, 2019/08/19
- [Qemu-devel] [PULL 16/17] iotests: Fix 141 when run with qed, Max Reitz, 2019/08/19
- Re: [Qemu-devel] [PULL 00/17] Block patches, Peter Maydell, 2019/08/20