motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 16:53:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

iotest 302: use img_info_log() helper

Browse source 
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:
Vladimir Sementsov-Ogievskiy 2021-12-23 17:01:36 +01:00 • committed by Hanna Reitz
parent e877bba308
commit c30175d6fb
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/qemu-iotests/302
View file

@ -34,6 +34,7 @@ from iotests import (
qemu_img_measure, qemu_img_measure,
qemu_io, qemu_io,
qemu_nbd_popen, qemu_nbd_popen,
img_info_log,
) )
iotests.script_initialize(supported_fmts=["qcow2"]) iotests.script_initialize(supported_fmts=["qcow2"])
@ -88,6 +89,7 @@ with tarfile.open(tar_file, "w") as tar:
tar_file): tar_file):
iotests.log("=== Target image info ===") 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_log("info", nbd_uri)
qemu_img( qemu_img(
@ -99,7 +101,7 @@ with tarfile.open(tar_file, "w") as tar:
nbd_uri) nbd_uri)
iotests.log("=== Converted image info ===") iotests.log("=== Converted image info ===")
qemu_img_log("info", nbd_uri) img_info_log(nbd_uri)
iotests.log("=== Converted image check ===") iotests.log("=== Converted image check ===")
qemu_img_log("check", nbd_uri) qemu_img_log("check", nbd_uri)

7
tests/qemu-iotests/302.out
View file

@ -6,14 +6,13 @@ virtual size: 448 KiB (458752 bytes)
disk size: unavailable disk size: unavailable
=== Converted image info === === Converted image info ===
image: nbd+unix:///exp?socket=SOCK_DIR/PID-nbd-sock image: TEST_IMG
file format: qcow2 file format: IMGFMT
virtual size: 1 GiB (1073741824 bytes) virtual size: 1 GiB (1073741824 bytes)
disk size: unavailable
cluster_size: 65536 cluster_size: 65536
Format specific information: Format specific information:
compat: 1.1 compat: 1.1
compression type: zlib compression type: COMPRESSION_TYPE
lazy refcounts: false lazy refcounts: false
refcount bits: 16 refcount bits: 16
corrupt: false corrupt: false