mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
iotest 302: use img_info_log() helper
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> Message-Id: <20211223160144.1097696-12-vsementsov@virtuozzo.com> Signed-off-by: Hanna Reitz <hreitz@redhat.com>
This commit is contained in:
parent
e877bba308
commit
c30175d6fb
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue