[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 09/17] iotest 302: use img_info_log() helper
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v2 09/17] iotest 302: use img_info_log() helper |
Date: |
Tue, 20 Jul 2021 14:38:24 +0300 |
Instead of qemu_img_log("info", ..) use generic helper img_info_log().
img_info_log() has smarter logic. For example it use filter_img_info()
to filter output, which in turns filter a compression type. So it will
help us in future when we implement a possibility to use zstd
compression by default (with help of some runtime config file or maybe
build option). For now to test you should recompile qemu with a small
addition into block/qcow2.c before
"if (qcow2_opts->has_compression_type":
if (!qcow2_opts->has_compression_type && version >= 3) {
qcow2_opts->has_compression_type = true;
qcow2_opts->compression_type = QCOW2_COMPRESSION_TYPE_ZSTD;
}
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/302 | 4 +++-
tests/qemu-iotests/302.out | 7 +++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/tests/qemu-iotests/302 b/tests/qemu-iotests/302
index 5695af4914..a6d79e727b 100755
--- a/tests/qemu-iotests/302
+++ b/tests/qemu-iotests/302
@@ -34,6 +34,7 @@ from iotests import (
qemu_img_measure,
qemu_io,
qemu_nbd_popen,
+ img_info_log,
)
iotests.script_initialize(supported_fmts=["qcow2"])
@@ -88,6 +89,7 @@ with tarfile.open(tar_file, "w") as tar:
tar_file):
iotests.log("=== Target image info ===")
+ # Not img_info_log as it enforces imgfmt, but now we print info on raw
qemu_img_log("info", nbd_uri)
qemu_img(
@@ -99,7 +101,7 @@ with tarfile.open(tar_file, "w") as tar:
nbd_uri)
iotests.log("=== Converted image info ===")
- qemu_img_log("info", nbd_uri)
+ img_info_log(nbd_uri)
iotests.log("=== Converted image check ===")
qemu_img_log("check", nbd_uri)
diff --git a/tests/qemu-iotests/302.out b/tests/qemu-iotests/302.out
index e2f6077e83..3e7c281b91 100644
--- a/tests/qemu-iotests/302.out
+++ b/tests/qemu-iotests/302.out
@@ -6,14 +6,13 @@ virtual size: 448 KiB (458752 bytes)
disk size: unavailable
=== Converted image info ===
-image: nbd+unix:///exp?socket=SOCK_DIR/PID-nbd-sock
-file format: qcow2
+image: TEST_IMG
+file format: IMGFMT
virtual size: 1 GiB (1073741824 bytes)
-disk size: unavailable
cluster_size: 65536
Format specific information:
compat: 1.1
- compression type: zlib
+ compression type: COMPRESSION_TYPE
lazy refcounts: false
refcount bits: 16
corrupt: false
--
2.29.2
- [PATCH v2 04/17] iotests.py: rewrite default luks support in qemu_img, (continued)
- [PATCH v2 04/17] iotests.py: rewrite default luks support in qemu_img, Vladimir Sementsov-Ogievskiy, 2021/07/20
- [PATCH v2 05/17] iotest 303: explicit compression type, Vladimir Sementsov-Ogievskiy, 2021/07/20
- [PATCH v2 03/17] iotests: drop qemu_img_verbose() helper, Vladimir Sementsov-Ogievskiy, 2021/07/20
- [PATCH v2 07/17] iotests.py: filter out successful output of qemu-img crate, Vladimir Sementsov-Ogievskiy, 2021/07/20
- [PATCH v2 08/17] iotests.py: filter compression type out, Vladimir Sementsov-Ogievskiy, 2021/07/20
- [PATCH v2 11/17] iotests/common.rc: introduce _qcow2_dump_header helper, Vladimir Sementsov-Ogievskiy, 2021/07/20
- [PATCH v2 06/17] iotest 065: explicit compression type, Vladimir Sementsov-Ogievskiy, 2021/07/20
- [PATCH v2 10/17] qcow2: simple case support for downgrading of qcow2 images with zstd, Vladimir Sementsov-Ogievskiy, 2021/07/20
- [PATCH v2 16/17] iotest 214: explicit compression type, Vladimir Sementsov-Ogievskiy, 2021/07/20
- [PATCH v2 17/17] iotests: declare lack of support for compresion_type in IMGOPTS, Vladimir Sementsov-Ogievskiy, 2021/07/20
- [PATCH v2 09/17] iotest 302: use img_info_log() helper,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v2 12/17] iotests: massive use _qcow2_dump_header, Vladimir Sementsov-Ogievskiy, 2021/07/20
- [PATCH v2 13/17] iotest 39: use _qcow2_dump_header, Vladimir Sementsov-Ogievskiy, 2021/07/20
- [PATCH v2 14/17] iotests: bash tests: filter compression type, Vladimir Sementsov-Ogievskiy, 2021/07/20
- [PATCH v2 15/17] iotests 60: more accurate set dirty bit in qcow2 header, Vladimir Sementsov-Ogievskiy, 2021/07/20