| Message ID | 20200227072953.25445-7-dplotnikov@virtuozzo.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | qcow2: Implement zstd cluster compression method | expand |
27.02.2020 10:29, Denis Plotnikov wrote: > Affected tests: 049, 060, 061, 065, 144, 182, 242, 255 > > After adding the compression type feature for qcow2, the compression type > is reported on image quering. > > Add the corresponding values of the "compression type" for the tests' output > matching. And this and the following patch. Ideally, patch should not break any iotests. This means that all iotest updates should be merged to the patch which changes their output. Probably, you can split behavior-changing patch, to reduce iotest-updates per patch, but anyway, big patch with a lot of iotests updates is better than patch which breaks iotests. > > Signed-off-by: Denis Plotnikov <dplotnikov@virtuozzo.com> > --- > tests/qemu-iotests/049.out | 102 ++++++++++++++++++------------------- > tests/qemu-iotests/060.out | 1 + > tests/qemu-iotests/061.out | 6 +++ > tests/qemu-iotests/065 | 20 +++++--- > tests/qemu-iotests/144.out | 4 +- > tests/qemu-iotests/182.out | 2 +- > tests/qemu-iotests/242.out | 5 ++ > tests/qemu-iotests/255.out | 8 +-- > 8 files changed, 82 insertions(+), 66 deletions(-) > > diff --git a/tests/qemu-iotests/049.out b/tests/qemu-iotests/049.out > index affa55b341..a5cfba1756 100644 > --- a/tests/qemu-iotests/049.out > +++ b/tests/qemu-iotests/049.out > @@ -4,90 +4,90 @@ QA output created by 049 > == 1. Traditional size parameter == > > qemu-img create -f qcow2 TEST_DIR/t.qcow2 1024 > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 TEST_DIR/t.qcow2 1024b > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 TEST_DIR/t.qcow2 1k > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 TEST_DIR/t.qcow2 1K > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 TEST_DIR/t.qcow2 1M > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1048576 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1048576 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 TEST_DIR/t.qcow2 1G > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1073741824 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1073741824 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 TEST_DIR/t.qcow2 1T > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1099511627776 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1099511627776 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 TEST_DIR/t.qcow2 1024.0 > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 TEST_DIR/t.qcow2 1024.0b > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 TEST_DIR/t.qcow2 1.5k > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 TEST_DIR/t.qcow2 1.5K > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 TEST_DIR/t.qcow2 1.5M > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1572864 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1572864 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 TEST_DIR/t.qcow2 1.5G > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1610612736 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1610612736 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 TEST_DIR/t.qcow2 1.5T > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1649267441664 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1649267441664 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > == 2. Specifying size via -o == > > qemu-img create -f qcow2 -o size=1024 TEST_DIR/t.qcow2 > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o size=1024b TEST_DIR/t.qcow2 > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o size=1k TEST_DIR/t.qcow2 > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o size=1K TEST_DIR/t.qcow2 > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o size=1M TEST_DIR/t.qcow2 > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1048576 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1048576 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o size=1G TEST_DIR/t.qcow2 > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1073741824 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1073741824 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o size=1T TEST_DIR/t.qcow2 > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1099511627776 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1099511627776 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o size=1024.0 TEST_DIR/t.qcow2 > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o size=1024.0b TEST_DIR/t.qcow2 > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o size=1.5k TEST_DIR/t.qcow2 > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o size=1.5K TEST_DIR/t.qcow2 > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o size=1.5M TEST_DIR/t.qcow2 > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1572864 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1572864 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o size=1.5G TEST_DIR/t.qcow2 > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1610612736 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1610612736 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o size=1.5T TEST_DIR/t.qcow2 > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1649267441664 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1649267441664 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > == 3. Invalid sizes == > > @@ -129,84 +129,84 @@ qemu-img: TEST_DIR/t.qcow2: The image size must be specified only once > == Check correct interpretation of suffixes for cluster size == > > qemu-img create -f qcow2 -o cluster_size=1024 TEST_DIR/t.qcow2 64M > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o cluster_size=1024b TEST_DIR/t.qcow2 64M > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o cluster_size=1k TEST_DIR/t.qcow2 64M > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o cluster_size=1K TEST_DIR/t.qcow2 64M > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o cluster_size=1M TEST_DIR/t.qcow2 64M > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1048576 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1048576 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o cluster_size=1024.0 TEST_DIR/t.qcow2 64M > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o cluster_size=1024.0b TEST_DIR/t.qcow2 64M > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o cluster_size=0.5k TEST_DIR/t.qcow2 64M > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=512 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=512 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o cluster_size=0.5K TEST_DIR/t.qcow2 64M > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=512 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=512 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o cluster_size=0.5M TEST_DIR/t.qcow2 64M > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=524288 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=524288 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > == Check compat level option == > > qemu-img create -f qcow2 -o compat=0.10 TEST_DIR/t.qcow2 64M > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o compat=1.1 TEST_DIR/t.qcow2 64M > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o compat=0.42 TEST_DIR/t.qcow2 64M > qemu-img: TEST_DIR/t.qcow2: Invalid parameter '0.42' > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.42 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.42 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o compat=foobar TEST_DIR/t.qcow2 64M > qemu-img: TEST_DIR/t.qcow2: Invalid parameter 'foobar' > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=foobar cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=foobar cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > == Check preallocation option == > > qemu-img create -f qcow2 -o preallocation=off TEST_DIR/t.qcow2 64M > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=65536 preallocation=off lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=65536 preallocation=off lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o preallocation=metadata TEST_DIR/t.qcow2 64M > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=65536 preallocation=metadata lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=65536 preallocation=metadata lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o preallocation=1234 TEST_DIR/t.qcow2 64M > qemu-img: TEST_DIR/t.qcow2: Invalid parameter '1234' > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=65536 preallocation=1234 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=65536 preallocation=1234 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > == Check encryption option == > > qemu-img create -f qcow2 -o encryption=off TEST_DIR/t.qcow2 64M > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 encryption=off cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 encryption=off cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 --object secret,id=sec0,data=123456 -o encryption=on,encrypt.key-secret=sec0 TEST_DIR/t.qcow2 64M > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 encryption=on encrypt.key-secret=sec0 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 encryption=on encrypt.key-secret=sec0 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > == Check lazy_refcounts option (only with v3) == > > qemu-img create -f qcow2 -o compat=1.1,lazy_refcounts=off TEST_DIR/t.qcow2 64M > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o compat=1.1,lazy_refcounts=on TEST_DIR/t.qcow2 64M > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 cluster_size=65536 lazy_refcounts=on refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 cluster_size=65536 lazy_refcounts=on refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o compat=0.10,lazy_refcounts=off TEST_DIR/t.qcow2 64M > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > qemu-img create -f qcow2 -o compat=0.10,lazy_refcounts=on TEST_DIR/t.qcow2 64M > qemu-img: TEST_DIR/t.qcow2: Lazy refcounts only supported with compatibility level 1.1 and above (use version=v3 or greater) > -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 cluster_size=65536 lazy_refcounts=on refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 cluster_size=65536 lazy_refcounts=on refcount_bits=16 compression_type=zlib > > *** done > diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out > index d27692a33c..3e47f537e8 100644 > --- a/tests/qemu-iotests/060.out > +++ b/tests/qemu-iotests/060.out > @@ -17,6 +17,7 @@ virtual size: 64 MiB (67108864 bytes) > cluster_size: 65536 > Format specific information: > compat: 1.1 > + compression type: zlib > lazy refcounts: false > refcount bits: 16 > corrupt: true > diff --git a/tests/qemu-iotests/061.out b/tests/qemu-iotests/061.out > index cea7fedfdc..c913f02ad6 100644 > --- a/tests/qemu-iotests/061.out > +++ b/tests/qemu-iotests/061.out > @@ -491,6 +491,7 @@ virtual size: 64 MiB (67108864 bytes) > cluster_size: 65536 > Format specific information: > compat: 1.1 > + compression type: zlib > lazy refcounts: false > refcount bits: 16 > data file: TEST_DIR/t.IMGFMT.data > @@ -511,6 +512,7 @@ virtual size: 64 MiB (67108864 bytes) > cluster_size: 65536 > Format specific information: > compat: 1.1 > + compression type: zlib > lazy refcounts: false > refcount bits: 16 > data file: foo > @@ -524,6 +526,7 @@ virtual size: 64 MiB (67108864 bytes) > cluster_size: 65536 > Format specific information: > compat: 1.1 > + compression type: zlib > lazy refcounts: false > refcount bits: 16 > data file raw: false > @@ -538,6 +541,7 @@ virtual size: 64 MiB (67108864 bytes) > cluster_size: 65536 > Format specific information: > compat: 1.1 > + compression type: zlib > lazy refcounts: false > refcount bits: 16 > data file: TEST_DIR/t.IMGFMT.data > @@ -550,6 +554,7 @@ virtual size: 64 MiB (67108864 bytes) > cluster_size: 65536 > Format specific information: > compat: 1.1 > + compression type: zlib > lazy refcounts: false > refcount bits: 16 > data file: TEST_DIR/t.IMGFMT.data > @@ -563,6 +568,7 @@ virtual size: 64 MiB (67108864 bytes) > cluster_size: 65536 > Format specific information: > compat: 1.1 > + compression type: zlib > lazy refcounts: false > refcount bits: 16 > data file: TEST_DIR/t.IMGFMT.data > diff --git a/tests/qemu-iotests/065 b/tests/qemu-iotests/065 > index 6426474271..106303b5a5 100755 > --- a/tests/qemu-iotests/065 > +++ b/tests/qemu-iotests/065 > @@ -88,23 +88,25 @@ class TestQMP(TestImageInfoSpecific): > class TestQCow2(TestQemuImgInfo): > '''Testing a qcow2 version 2 image''' > img_options = 'compat=0.10' > - json_compare = { 'compat': '0.10', 'refcount-bits': 16 } > - human_compare = [ 'compat: 0.10', 'refcount bits: 16' ] > + json_compare = { 'compat': '0.10', 'refcount-bits': 16, 'compression-type': 'zlib' } > + human_compare = [ 'compat: 0.10', 'compression type: zlib', 'refcount bits: 16' ] > > class TestQCow3NotLazy(TestQemuImgInfo): > '''Testing a qcow2 version 3 image with lazy refcounts disabled''' > img_options = 'compat=1.1,lazy_refcounts=off' > json_compare = { 'compat': '1.1', 'lazy-refcounts': False, > - 'refcount-bits': 16, 'corrupt': False } > - human_compare = [ 'compat: 1.1', 'lazy refcounts: false', > + 'refcount-bits': 16, 'corrupt': False, > + 'compression-type': 'zlib' } > + human_compare = [ 'compat: 1.1', 'compression type: zlib', 'lazy refcounts: false', > 'refcount bits: 16', 'corrupt: false' ] > > class TestQCow3Lazy(TestQemuImgInfo): > '''Testing a qcow2 version 3 image with lazy refcounts enabled''' > img_options = 'compat=1.1,lazy_refcounts=on' > json_compare = { 'compat': '1.1', 'lazy-refcounts': True, > - 'refcount-bits': 16, 'corrupt': False } > - human_compare = [ 'compat: 1.1', 'lazy refcounts: true', > + 'refcount-bits': 16, 'corrupt': False, > + 'compression-type': 'zlib' } > + human_compare = [ 'compat: 1.1', 'compression type: zlib', 'lazy refcounts: true', > 'refcount bits: 16', 'corrupt: false' ] > > class TestQCow3NotLazyQMP(TestQMP): > @@ -113,7 +115,8 @@ class TestQCow3NotLazyQMP(TestQMP): > img_options = 'compat=1.1,lazy_refcounts=off' > qemu_options = 'lazy-refcounts=on' > compare = { 'compat': '1.1', 'lazy-refcounts': False, > - 'refcount-bits': 16, 'corrupt': False } > + 'refcount-bits': 16, 'corrupt': False, > + 'compression-type': 'zlib' } > > > class TestQCow3LazyQMP(TestQMP): > @@ -122,7 +125,8 @@ class TestQCow3LazyQMP(TestQMP): > img_options = 'compat=1.1,lazy_refcounts=on' > qemu_options = 'lazy-refcounts=off' > compare = { 'compat': '1.1', 'lazy-refcounts': True, > - 'refcount-bits': 16, 'corrupt': False } > + 'refcount-bits': 16, 'corrupt': False, > + 'compression-type': 'zlib' } > > TestImageInfoSpecific = None > TestQemuImgInfo = None > diff --git a/tests/qemu-iotests/144.out b/tests/qemu-iotests/144.out > index c7aa2e4820..885a8874a5 100644 > --- a/tests/qemu-iotests/144.out > +++ b/tests/qemu-iotests/144.out > @@ -9,7 +9,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=536870912 > { 'execute': 'qmp_capabilities' } > {"return": {}} > { 'execute': 'blockdev-snapshot-sync', 'arguments': { 'device': 'virtio0', 'snapshot-file':'TEST_DIR/tmp.IMGFMT', 'format': 'IMGFMT' } } > -Formatting 'TEST_DIR/tmp.qcow2', fmt=qcow2 size=536870912 backing_file=TEST_DIR/t.qcow2 backing_fmt=qcow2 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/tmp.qcow2', fmt=qcow2 size=536870912 backing_file=TEST_DIR/t.qcow2 backing_fmt=qcow2 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > {"return": {}} > > === Performing block-commit on active layer === > @@ -31,6 +31,6 @@ Formatting 'TEST_DIR/tmp.qcow2', fmt=qcow2 size=536870912 backing_file=TEST_DIR/ > === Performing Live Snapshot 2 === > > { 'execute': 'blockdev-snapshot-sync', 'arguments': { 'device': 'virtio0', 'snapshot-file':'TEST_DIR/tmp2.IMGFMT', 'format': 'IMGFMT' } } > -Formatting 'TEST_DIR/tmp2.qcow2', fmt=qcow2 size=536870912 backing_file=TEST_DIR/t.qcow2 backing_fmt=qcow2 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/tmp2.qcow2', fmt=qcow2 size=536870912 backing_file=TEST_DIR/t.qcow2 backing_fmt=qcow2 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > {"return": {}} > *** done > diff --git a/tests/qemu-iotests/182.out b/tests/qemu-iotests/182.out > index a8eea166c3..ae43654d32 100644 > --- a/tests/qemu-iotests/182.out > +++ b/tests/qemu-iotests/182.out > @@ -13,7 +13,7 @@ Is another process using the image [TEST_DIR/t.qcow2]? > {'execute': 'blockdev-add', 'arguments': { 'node-name': 'node0', 'driver': 'file', 'filename': 'TEST_DIR/t.IMGFMT', 'locking': 'on' } } > {"return": {}} > {'execute': 'blockdev-snapshot-sync', 'arguments': { 'node-name': 'node0', 'snapshot-file': 'TEST_DIR/t.IMGFMT.overlay', 'snapshot-node-name': 'node1' } } > -Formatting 'TEST_DIR/t.qcow2.overlay', fmt=qcow2 size=197120 backing_file=TEST_DIR/t.qcow2 backing_fmt=file cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/t.qcow2.overlay', fmt=qcow2 size=197120 backing_file=TEST_DIR/t.qcow2 backing_fmt=file cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > {"return": {}} > {'execute': 'blockdev-add', 'arguments': { 'node-name': 'node1', 'driver': 'file', 'filename': 'TEST_DIR/t.IMGFMT', 'locking': 'on' } } > {"return": {}} > diff --git a/tests/qemu-iotests/242.out b/tests/qemu-iotests/242.out > index 7ac8404d11..091b9126ce 100644 > --- a/tests/qemu-iotests/242.out > +++ b/tests/qemu-iotests/242.out > @@ -12,6 +12,7 @@ virtual size: 1 MiB (1048576 bytes) > cluster_size: 65536 > Format specific information: > compat: 1.1 > + compression type: zlib > lazy refcounts: false > refcount bits: 16 > corrupt: false > @@ -32,6 +33,7 @@ virtual size: 1 MiB (1048576 bytes) > cluster_size: 65536 > Format specific information: > compat: 1.1 > + compression type: zlib > lazy refcounts: false > bitmaps: > [0]: > @@ -64,6 +66,7 @@ virtual size: 1 MiB (1048576 bytes) > cluster_size: 65536 > Format specific information: > compat: 1.1 > + compression type: zlib > lazy refcounts: false > bitmaps: > [0]: > @@ -104,6 +107,7 @@ virtual size: 1 MiB (1048576 bytes) > cluster_size: 65536 > Format specific information: > compat: 1.1 > + compression type: zlib > lazy refcounts: false > bitmaps: > [0]: > @@ -153,6 +157,7 @@ virtual size: 1 MiB (1048576 bytes) > cluster_size: 65536 > Format specific information: > compat: 1.1 > + compression type: zlib > lazy refcounts: false > bitmaps: > [0]: > diff --git a/tests/qemu-iotests/255.out b/tests/qemu-iotests/255.out > index 348909fdef..a3c99fd62e 100644 > --- a/tests/qemu-iotests/255.out > +++ b/tests/qemu-iotests/255.out > @@ -3,9 +3,9 @@ Finishing a commit job with background reads > > === Create backing chain and start VM === > > -Formatting 'TEST_DIR/PID-t.qcow2.mid', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/PID-t.qcow2.mid', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > -Formatting 'TEST_DIR/PID-t.qcow2', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/PID-t.qcow2', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > === Start background read requests === > > @@ -23,9 +23,9 @@ Closing the VM while a job is being cancelled > > === Create images and start VM === > > -Formatting 'TEST_DIR/PID-src.qcow2', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/PID-src.qcow2', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > -Formatting 'TEST_DIR/PID-dst.qcow2', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16 > +Formatting 'TEST_DIR/PID-dst.qcow2', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib > > wrote 1048576/1048576 bytes at offset 0 > 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) >
27.02.2020 13:04, Vladimir Sementsov-Ogievskiy wrote: > 27.02.2020 10:29, Denis Plotnikov wrote: >> Affected tests: 049, 060, 061, 065, 144, 182, 242, 255 >> >> After adding the compression type feature for qcow2, the compression type >> is reported on image quering. >> >> Add the corresponding values of the "compression type" for the tests' output >> matching. > > And this and the following patch. > > Ideally, patch should not break any iotests. This means that all iotest updates > should be merged to the patch which changes their output. Probably, you can split > behavior-changing patch, to reduce iotest-updates per patch, but anyway, big patch > with a lot of iotests updates is better than patch which breaks iotests. Or we can try to reduce behavior changes in case of zlib: - keep header small in case of zlib, not adding zero field - don't add feature table entry, if compress type is zlib - don't report compression type on quering, if it is zlib - then, all iotests output will be saved. And, then, if we need, we can change these theree points one-by-one, updating iotests outputs. But I doubt that we really need it, compatible behavior seems good enough. > >> >> Signed-off-by: Denis Plotnikov <dplotnikov@virtuozzo.com> >> --- >> tests/qemu-iotests/049.out | 102 ++++++++++++++++++------------------- >> tests/qemu-iotests/060.out | 1 + >> tests/qemu-iotests/061.out | 6 +++ >> tests/qemu-iotests/065 | 20 +++++--- >> tests/qemu-iotests/144.out | 4 +- >> tests/qemu-iotests/182.out | 2 +- >> tests/qemu-iotests/242.out | 5 ++ >> tests/qemu-iotests/255.out | 8 +-- >> 8 files changed, 82 insertions(+), 66 deletions(-) >> >> diff --git a/tests/qemu-iotests/049.out b/tests/qemu-iotests/049.out >> index affa55b341..a5cfba1756 100644 >> --- a/tests/qemu-iotests/049.out >> +++ b/tests/qemu-iotests/049.out >> @@ -4,90 +4,90 @@ QA output created by 049 >> == 1. Traditional size parameter == >> qemu-img create -f qcow2 TEST_DIR/t.qcow2 1024 >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 TEST_DIR/t.qcow2 1024b >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 TEST_DIR/t.qcow2 1k >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 TEST_DIR/t.qcow2 1K >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 TEST_DIR/t.qcow2 1M >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1048576 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1048576 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 TEST_DIR/t.qcow2 1G >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1073741824 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1073741824 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 TEST_DIR/t.qcow2 1T >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1099511627776 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1099511627776 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 TEST_DIR/t.qcow2 1024.0 >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 TEST_DIR/t.qcow2 1024.0b >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 TEST_DIR/t.qcow2 1.5k >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 TEST_DIR/t.qcow2 1.5K >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 TEST_DIR/t.qcow2 1.5M >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1572864 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1572864 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 TEST_DIR/t.qcow2 1.5G >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1610612736 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1610612736 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 TEST_DIR/t.qcow2 1.5T >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1649267441664 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1649267441664 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> == 2. Specifying size via -o == >> qemu-img create -f qcow2 -o size=1024 TEST_DIR/t.qcow2 >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o size=1024b TEST_DIR/t.qcow2 >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o size=1k TEST_DIR/t.qcow2 >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o size=1K TEST_DIR/t.qcow2 >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o size=1M TEST_DIR/t.qcow2 >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1048576 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1048576 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o size=1G TEST_DIR/t.qcow2 >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1073741824 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1073741824 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o size=1T TEST_DIR/t.qcow2 >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1099511627776 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1099511627776 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o size=1024.0 TEST_DIR/t.qcow2 >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o size=1024.0b TEST_DIR/t.qcow2 >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o size=1.5k TEST_DIR/t.qcow2 >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o size=1.5K TEST_DIR/t.qcow2 >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o size=1.5M TEST_DIR/t.qcow2 >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1572864 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1572864 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o size=1.5G TEST_DIR/t.qcow2 >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1610612736 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1610612736 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o size=1.5T TEST_DIR/t.qcow2 >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1649267441664 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1649267441664 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> == 3. Invalid sizes == >> @@ -129,84 +129,84 @@ qemu-img: TEST_DIR/t.qcow2: The image size must be specified only once >> == Check correct interpretation of suffixes for cluster size == >> qemu-img create -f qcow2 -o cluster_size=1024 TEST_DIR/t.qcow2 64M >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o cluster_size=1024b TEST_DIR/t.qcow2 64M >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o cluster_size=1k TEST_DIR/t.qcow2 64M >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o cluster_size=1K TEST_DIR/t.qcow2 64M >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o cluster_size=1M TEST_DIR/t.qcow2 64M >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1048576 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1048576 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o cluster_size=1024.0 TEST_DIR/t.qcow2 64M >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o cluster_size=1024.0b TEST_DIR/t.qcow2 64M >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o cluster_size=0.5k TEST_DIR/t.qcow2 64M >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=512 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=512 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o cluster_size=0.5K TEST_DIR/t.qcow2 64M >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=512 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=512 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o cluster_size=0.5M TEST_DIR/t.qcow2 64M >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=524288 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=524288 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> == Check compat level option == >> qemu-img create -f qcow2 -o compat=0.10 TEST_DIR/t.qcow2 64M >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o compat=1.1 TEST_DIR/t.qcow2 64M >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o compat=0.42 TEST_DIR/t.qcow2 64M >> qemu-img: TEST_DIR/t.qcow2: Invalid parameter '0.42' >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.42 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.42 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o compat=foobar TEST_DIR/t.qcow2 64M >> qemu-img: TEST_DIR/t.qcow2: Invalid parameter 'foobar' >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=foobar cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=foobar cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> == Check preallocation option == >> qemu-img create -f qcow2 -o preallocation=off TEST_DIR/t.qcow2 64M >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=65536 preallocation=off lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=65536 preallocation=off lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o preallocation=metadata TEST_DIR/t.qcow2 64M >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=65536 preallocation=metadata lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=65536 preallocation=metadata lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o preallocation=1234 TEST_DIR/t.qcow2 64M >> qemu-img: TEST_DIR/t.qcow2: Invalid parameter '1234' >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=65536 preallocation=1234 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=65536 preallocation=1234 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> == Check encryption option == >> qemu-img create -f qcow2 -o encryption=off TEST_DIR/t.qcow2 64M >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 encryption=off cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 encryption=off cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 --object secret,id=sec0,data=123456 -o encryption=on,encrypt.key-secret=sec0 TEST_DIR/t.qcow2 64M >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 encryption=on encrypt.key-secret=sec0 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 encryption=on encrypt.key-secret=sec0 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> == Check lazy_refcounts option (only with v3) == >> qemu-img create -f qcow2 -o compat=1.1,lazy_refcounts=off TEST_DIR/t.qcow2 64M >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o compat=1.1,lazy_refcounts=on TEST_DIR/t.qcow2 64M >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 cluster_size=65536 lazy_refcounts=on refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 cluster_size=65536 lazy_refcounts=on refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o compat=0.10,lazy_refcounts=off TEST_DIR/t.qcow2 64M >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> qemu-img create -f qcow2 -o compat=0.10,lazy_refcounts=on TEST_DIR/t.qcow2 64M >> qemu-img: TEST_DIR/t.qcow2: Lazy refcounts only supported with compatibility level 1.1 and above (use version=v3 or greater) >> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 cluster_size=65536 lazy_refcounts=on refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 cluster_size=65536 lazy_refcounts=on refcount_bits=16 compression_type=zlib >> *** done >> diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out >> index d27692a33c..3e47f537e8 100644 >> --- a/tests/qemu-iotests/060.out >> +++ b/tests/qemu-iotests/060.out >> @@ -17,6 +17,7 @@ virtual size: 64 MiB (67108864 bytes) >> cluster_size: 65536 >> Format specific information: >> compat: 1.1 >> + compression type: zlib >> lazy refcounts: false >> refcount bits: 16 >> corrupt: true >> diff --git a/tests/qemu-iotests/061.out b/tests/qemu-iotests/061.out >> index cea7fedfdc..c913f02ad6 100644 >> --- a/tests/qemu-iotests/061.out >> +++ b/tests/qemu-iotests/061.out >> @@ -491,6 +491,7 @@ virtual size: 64 MiB (67108864 bytes) >> cluster_size: 65536 >> Format specific information: >> compat: 1.1 >> + compression type: zlib >> lazy refcounts: false >> refcount bits: 16 >> data file: TEST_DIR/t.IMGFMT.data >> @@ -511,6 +512,7 @@ virtual size: 64 MiB (67108864 bytes) >> cluster_size: 65536 >> Format specific information: >> compat: 1.1 >> + compression type: zlib >> lazy refcounts: false >> refcount bits: 16 >> data file: foo >> @@ -524,6 +526,7 @@ virtual size: 64 MiB (67108864 bytes) >> cluster_size: 65536 >> Format specific information: >> compat: 1.1 >> + compression type: zlib >> lazy refcounts: false >> refcount bits: 16 >> data file raw: false >> @@ -538,6 +541,7 @@ virtual size: 64 MiB (67108864 bytes) >> cluster_size: 65536 >> Format specific information: >> compat: 1.1 >> + compression type: zlib >> lazy refcounts: false >> refcount bits: 16 >> data file: TEST_DIR/t.IMGFMT.data >> @@ -550,6 +554,7 @@ virtual size: 64 MiB (67108864 bytes) >> cluster_size: 65536 >> Format specific information: >> compat: 1.1 >> + compression type: zlib >> lazy refcounts: false >> refcount bits: 16 >> data file: TEST_DIR/t.IMGFMT.data >> @@ -563,6 +568,7 @@ virtual size: 64 MiB (67108864 bytes) >> cluster_size: 65536 >> Format specific information: >> compat: 1.1 >> + compression type: zlib >> lazy refcounts: false >> refcount bits: 16 >> data file: TEST_DIR/t.IMGFMT.data >> diff --git a/tests/qemu-iotests/065 b/tests/qemu-iotests/065 >> index 6426474271..106303b5a5 100755 >> --- a/tests/qemu-iotests/065 >> +++ b/tests/qemu-iotests/065 >> @@ -88,23 +88,25 @@ class TestQMP(TestImageInfoSpecific): >> class TestQCow2(TestQemuImgInfo): >> '''Testing a qcow2 version 2 image''' >> img_options = 'compat=0.10' >> - json_compare = { 'compat': '0.10', 'refcount-bits': 16 } >> - human_compare = [ 'compat: 0.10', 'refcount bits: 16' ] >> + json_compare = { 'compat': '0.10', 'refcount-bits': 16, 'compression-type': 'zlib' } >> + human_compare = [ 'compat: 0.10', 'compression type: zlib', 'refcount bits: 16' ] >> class TestQCow3NotLazy(TestQemuImgInfo): >> '''Testing a qcow2 version 3 image with lazy refcounts disabled''' >> img_options = 'compat=1.1,lazy_refcounts=off' >> json_compare = { 'compat': '1.1', 'lazy-refcounts': False, >> - 'refcount-bits': 16, 'corrupt': False } >> - human_compare = [ 'compat: 1.1', 'lazy refcounts: false', >> + 'refcount-bits': 16, 'corrupt': False, >> + 'compression-type': 'zlib' } >> + human_compare = [ 'compat: 1.1', 'compression type: zlib', 'lazy refcounts: false', >> 'refcount bits: 16', 'corrupt: false' ] >> class TestQCow3Lazy(TestQemuImgInfo): >> '''Testing a qcow2 version 3 image with lazy refcounts enabled''' >> img_options = 'compat=1.1,lazy_refcounts=on' >> json_compare = { 'compat': '1.1', 'lazy-refcounts': True, >> - 'refcount-bits': 16, 'corrupt': False } >> - human_compare = [ 'compat: 1.1', 'lazy refcounts: true', >> + 'refcount-bits': 16, 'corrupt': False, >> + 'compression-type': 'zlib' } >> + human_compare = [ 'compat: 1.1', 'compression type: zlib', 'lazy refcounts: true', >> 'refcount bits: 16', 'corrupt: false' ] >> class TestQCow3NotLazyQMP(TestQMP): >> @@ -113,7 +115,8 @@ class TestQCow3NotLazyQMP(TestQMP): >> img_options = 'compat=1.1,lazy_refcounts=off' >> qemu_options = 'lazy-refcounts=on' >> compare = { 'compat': '1.1', 'lazy-refcounts': False, >> - 'refcount-bits': 16, 'corrupt': False } >> + 'refcount-bits': 16, 'corrupt': False, >> + 'compression-type': 'zlib' } >> class TestQCow3LazyQMP(TestQMP): >> @@ -122,7 +125,8 @@ class TestQCow3LazyQMP(TestQMP): >> img_options = 'compat=1.1,lazy_refcounts=on' >> qemu_options = 'lazy-refcounts=off' >> compare = { 'compat': '1.1', 'lazy-refcounts': True, >> - 'refcount-bits': 16, 'corrupt': False } >> + 'refcount-bits': 16, 'corrupt': False, >> + 'compression-type': 'zlib' } >> TestImageInfoSpecific = None >> TestQemuImgInfo = None >> diff --git a/tests/qemu-iotests/144.out b/tests/qemu-iotests/144.out >> index c7aa2e4820..885a8874a5 100644 >> --- a/tests/qemu-iotests/144.out >> +++ b/tests/qemu-iotests/144.out >> @@ -9,7 +9,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=536870912 >> { 'execute': 'qmp_capabilities' } >> {"return": {}} >> { 'execute': 'blockdev-snapshot-sync', 'arguments': { 'device': 'virtio0', 'snapshot-file':'TEST_DIR/tmp.IMGFMT', 'format': 'IMGFMT' } } >> -Formatting 'TEST_DIR/tmp.qcow2', fmt=qcow2 size=536870912 backing_file=TEST_DIR/t.qcow2 backing_fmt=qcow2 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/tmp.qcow2', fmt=qcow2 size=536870912 backing_file=TEST_DIR/t.qcow2 backing_fmt=qcow2 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> {"return": {}} >> === Performing block-commit on active layer === >> @@ -31,6 +31,6 @@ Formatting 'TEST_DIR/tmp.qcow2', fmt=qcow2 size=536870912 backing_file=TEST_DIR/ >> === Performing Live Snapshot 2 === >> { 'execute': 'blockdev-snapshot-sync', 'arguments': { 'device': 'virtio0', 'snapshot-file':'TEST_DIR/tmp2.IMGFMT', 'format': 'IMGFMT' } } >> -Formatting 'TEST_DIR/tmp2.qcow2', fmt=qcow2 size=536870912 backing_file=TEST_DIR/t.qcow2 backing_fmt=qcow2 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/tmp2.qcow2', fmt=qcow2 size=536870912 backing_file=TEST_DIR/t.qcow2 backing_fmt=qcow2 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> {"return": {}} >> *** done >> diff --git a/tests/qemu-iotests/182.out b/tests/qemu-iotests/182.out >> index a8eea166c3..ae43654d32 100644 >> --- a/tests/qemu-iotests/182.out >> +++ b/tests/qemu-iotests/182.out >> @@ -13,7 +13,7 @@ Is another process using the image [TEST_DIR/t.qcow2]? >> {'execute': 'blockdev-add', 'arguments': { 'node-name': 'node0', 'driver': 'file', 'filename': 'TEST_DIR/t.IMGFMT', 'locking': 'on' } } >> {"return": {}} >> {'execute': 'blockdev-snapshot-sync', 'arguments': { 'node-name': 'node0', 'snapshot-file': 'TEST_DIR/t.IMGFMT.overlay', 'snapshot-node-name': 'node1' } } >> -Formatting 'TEST_DIR/t.qcow2.overlay', fmt=qcow2 size=197120 backing_file=TEST_DIR/t.qcow2 backing_fmt=file cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/t.qcow2.overlay', fmt=qcow2 size=197120 backing_file=TEST_DIR/t.qcow2 backing_fmt=file cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> {"return": {}} >> {'execute': 'blockdev-add', 'arguments': { 'node-name': 'node1', 'driver': 'file', 'filename': 'TEST_DIR/t.IMGFMT', 'locking': 'on' } } >> {"return": {}} >> diff --git a/tests/qemu-iotests/242.out b/tests/qemu-iotests/242.out >> index 7ac8404d11..091b9126ce 100644 >> --- a/tests/qemu-iotests/242.out >> +++ b/tests/qemu-iotests/242.out >> @@ -12,6 +12,7 @@ virtual size: 1 MiB (1048576 bytes) >> cluster_size: 65536 >> Format specific information: >> compat: 1.1 >> + compression type: zlib >> lazy refcounts: false >> refcount bits: 16 >> corrupt: false >> @@ -32,6 +33,7 @@ virtual size: 1 MiB (1048576 bytes) >> cluster_size: 65536 >> Format specific information: >> compat: 1.1 >> + compression type: zlib >> lazy refcounts: false >> bitmaps: >> [0]: >> @@ -64,6 +66,7 @@ virtual size: 1 MiB (1048576 bytes) >> cluster_size: 65536 >> Format specific information: >> compat: 1.1 >> + compression type: zlib >> lazy refcounts: false >> bitmaps: >> [0]: >> @@ -104,6 +107,7 @@ virtual size: 1 MiB (1048576 bytes) >> cluster_size: 65536 >> Format specific information: >> compat: 1.1 >> + compression type: zlib >> lazy refcounts: false >> bitmaps: >> [0]: >> @@ -153,6 +157,7 @@ virtual size: 1 MiB (1048576 bytes) >> cluster_size: 65536 >> Format specific information: >> compat: 1.1 >> + compression type: zlib >> lazy refcounts: false >> bitmaps: >> [0]: >> diff --git a/tests/qemu-iotests/255.out b/tests/qemu-iotests/255.out >> index 348909fdef..a3c99fd62e 100644 >> --- a/tests/qemu-iotests/255.out >> +++ b/tests/qemu-iotests/255.out >> @@ -3,9 +3,9 @@ Finishing a commit job with background reads >> === Create backing chain and start VM === >> -Formatting 'TEST_DIR/PID-t.qcow2.mid', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/PID-t.qcow2.mid', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> -Formatting 'TEST_DIR/PID-t.qcow2', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/PID-t.qcow2', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> === Start background read requests === >> @@ -23,9 +23,9 @@ Closing the VM while a job is being cancelled >> === Create images and start VM === >> -Formatting 'TEST_DIR/PID-src.qcow2', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/PID-src.qcow2', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> -Formatting 'TEST_DIR/PID-dst.qcow2', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16 >> +Formatting 'TEST_DIR/PID-dst.qcow2', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib >> wrote 1048576/1048576 bytes at offset 0 >> 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) >> > >
On 2/27/20 4:09 AM, Vladimir Sementsov-Ogievskiy wrote: > 27.02.2020 13:04, Vladimir Sementsov-Ogievskiy wrote: >> 27.02.2020 10:29, Denis Plotnikov wrote: >>> Affected tests: 049, 060, 061, 065, 144, 182, 242, 255 >>> >>> After adding the compression type feature for qcow2, the compression >>> type >>> is reported on image quering. >>> >>> Add the corresponding values of the "compression type" for the tests' >>> output >>> matching. >> >> And this and the following patch. >> >> Ideally, patch should not break any iotests. This means that all >> iotest updates >> should be merged to the patch which changes their output. Probably, >> you can split >> behavior-changing patch, to reduce iotest-updates per patch, but >> anyway, big patch >> with a lot of iotests updates is better than patch which breaks iotests. > > Or we can try to reduce behavior changes in case of zlib: > > - keep header small in case of zlib, not adding zero field No, I don't see the point in doing that. It makes maintenance harder to try to minimize the header, for no gain (older images parse the larger header just fine). > - don't add feature table entry, if compress type is zlib > - don't report compression type on quering, if it is zlib > > - then, all iotests output will be saved. And, then, if we need, we can > change > these theree points one-by-one, updating iotests outputs. But I doubt > that we > really need it, compatible behavior seems good enough. > [by the way, replying to this series is painful, since den@vrtuozzo.com is not a valid email address]
On 27.02.2020 13:09, Vladimir Sementsov-Ogievskiy wrote: > 27.02.2020 13:04, Vladimir Sementsov-Ogievskiy wrote: >> 27.02.2020 10:29, Denis Plotnikov wrote: >>> Affected tests: 049, 060, 061, 065, 144, 182, 242, 255 >>> >>> After adding the compression type feature for qcow2, the compression >>> type >>> is reported on image quering. >>> >>> Add the corresponding values of the "compression type" for the >>> tests' output >>> matching. >> >> And this and the following patch. >> >> Ideally, patch should not break any iotests. This means that all >> iotest updates >> should be merged to the patch which changes their output. Probably, >> you can split >> behavior-changing patch, to reduce iotest-updates per patch, but >> anyway, big patch >> with a lot of iotests updates is better than patch which breaks iotests. > > Or we can try to reduce behavior changes in case of zlib: > > - keep header small in case of zlib, not adding zero field > - don't add feature table entry, if compress type is zlib > - don't report compression type on quering, if it is zlib > > - then, all iotests output will be saved. And, then, if we need, we > can change > these theree points one-by-one, updating iotests outputs. But I doubt > that we > really need it, compatible behavior seems good enough. I think I would put some efforts in arranging the iotest patches so they don't break any tests after applying with the cost of creating a gigantic patch with the compression type implementation and iotest fixes Denis > >> >>> >>> Signed-off-by: Denis Plotnikov <dplotnikov@virtuozzo.com> >>> --- >>> tests/qemu-iotests/049.out | 102 >>> ++++++++++++++++++------------------- >>> tests/qemu-iotests/060.out | 1 + >>> tests/qemu-iotests/061.out | 6 +++ >>> tests/qemu-iotests/065 | 20 +++++--- >>> tests/qemu-iotests/144.out | 4 +- >>> tests/qemu-iotests/182.out | 2 +- >>> tests/qemu-iotests/242.out | 5 ++ >>> tests/qemu-iotests/255.out | 8 +-- >>> 8 files changed, 82 insertions(+), 66 deletions(-) >>> >>> diff --git a/tests/qemu-iotests/049.out b/tests/qemu-iotests/049.out >>> index affa55b341..a5cfba1756 100644 >>> --- a/tests/qemu-iotests/049.out >>> +++ b/tests/qemu-iotests/049.out >>> @@ -4,90 +4,90 @@ QA output created by 049 >>> == 1. Traditional size parameter == >>> qemu-img create -f qcow2 TEST_DIR/t.qcow2 1024 >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 TEST_DIR/t.qcow2 1024b >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 TEST_DIR/t.qcow2 1k >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 TEST_DIR/t.qcow2 1K >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 TEST_DIR/t.qcow2 1M >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1048576 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1048576 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 TEST_DIR/t.qcow2 1G >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1073741824 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1073741824 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 TEST_DIR/t.qcow2 1T >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1099511627776 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1099511627776 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 TEST_DIR/t.qcow2 1024.0 >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 TEST_DIR/t.qcow2 1024.0b >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 TEST_DIR/t.qcow2 1.5k >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 TEST_DIR/t.qcow2 1.5K >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 TEST_DIR/t.qcow2 1.5M >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1572864 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1572864 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 TEST_DIR/t.qcow2 1.5G >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1610612736 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1610612736 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 TEST_DIR/t.qcow2 1.5T >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1649267441664 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1649267441664 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> == 2. Specifying size via -o == >>> qemu-img create -f qcow2 -o size=1024 TEST_DIR/t.qcow2 >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 -o size=1024b TEST_DIR/t.qcow2 >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 -o size=1k TEST_DIR/t.qcow2 >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 -o size=1K TEST_DIR/t.qcow2 >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 -o size=1M TEST_DIR/t.qcow2 >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1048576 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1048576 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 -o size=1G TEST_DIR/t.qcow2 >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1073741824 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1073741824 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 -o size=1T TEST_DIR/t.qcow2 >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1099511627776 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1099511627776 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 -o size=1024.0 TEST_DIR/t.qcow2 >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 -o size=1024.0b TEST_DIR/t.qcow2 >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 -o size=1.5k TEST_DIR/t.qcow2 >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 -o size=1.5K TEST_DIR/t.qcow2 >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 -o size=1.5M TEST_DIR/t.qcow2 >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1572864 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1572864 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 -o size=1.5G TEST_DIR/t.qcow2 >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1610612736 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1610612736 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 -o size=1.5T TEST_DIR/t.qcow2 >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1649267441664 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1649267441664 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> == 3. Invalid sizes == >>> @@ -129,84 +129,84 @@ qemu-img: TEST_DIR/t.qcow2: The image size >>> must be specified only once >>> == Check correct interpretation of suffixes for cluster size == >>> qemu-img create -f qcow2 -o cluster_size=1024 TEST_DIR/t.qcow2 64M >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> cluster_size=1024 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> cluster_size=1024 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 -o cluster_size=1024b TEST_DIR/t.qcow2 64M >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> cluster_size=1024 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> cluster_size=1024 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 -o cluster_size=1k TEST_DIR/t.qcow2 64M >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> cluster_size=1024 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> cluster_size=1024 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 -o cluster_size=1K TEST_DIR/t.qcow2 64M >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> cluster_size=1024 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> cluster_size=1024 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 -o cluster_size=1M TEST_DIR/t.qcow2 64M >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> cluster_size=1048576 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> cluster_size=1048576 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 -o cluster_size=1024.0 TEST_DIR/t.qcow2 64M >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> cluster_size=1024 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> cluster_size=1024 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 -o cluster_size=1024.0b TEST_DIR/t.qcow2 64M >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> cluster_size=1024 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> cluster_size=1024 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 -o cluster_size=0.5k TEST_DIR/t.qcow2 64M >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> cluster_size=512 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> cluster_size=512 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 -o cluster_size=0.5K TEST_DIR/t.qcow2 64M >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> cluster_size=512 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> cluster_size=512 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 -o cluster_size=0.5M TEST_DIR/t.qcow2 64M >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> cluster_size=524288 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> cluster_size=524288 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> == Check compat level option == >>> qemu-img create -f qcow2 -o compat=0.10 TEST_DIR/t.qcow2 64M >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 -o compat=1.1 TEST_DIR/t.qcow2 64M >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 -o compat=0.42 TEST_DIR/t.qcow2 64M >>> qemu-img: TEST_DIR/t.qcow2: Invalid parameter '0.42' >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.42 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.42 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 -o compat=foobar TEST_DIR/t.qcow2 64M >>> qemu-img: TEST_DIR/t.qcow2: Invalid parameter 'foobar' >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> compat=foobar cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> compat=foobar cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> == Check preallocation option == >>> qemu-img create -f qcow2 -o preallocation=off TEST_DIR/t.qcow2 64M >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> cluster_size=65536 preallocation=off lazy_refcounts=off >>> refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> cluster_size=65536 preallocation=off lazy_refcounts=off >>> refcount_bits=16 compression_type=zlib >>> qemu-img create -f qcow2 -o preallocation=metadata >>> TEST_DIR/t.qcow2 64M >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> cluster_size=65536 preallocation=metadata lazy_refcounts=off >>> refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> cluster_size=65536 preallocation=metadata lazy_refcounts=off >>> refcount_bits=16 compression_type=zlib >>> qemu-img create -f qcow2 -o preallocation=1234 TEST_DIR/t.qcow2 64M >>> qemu-img: TEST_DIR/t.qcow2: Invalid parameter '1234' >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> cluster_size=65536 preallocation=1234 lazy_refcounts=off >>> refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> cluster_size=65536 preallocation=1234 lazy_refcounts=off >>> refcount_bits=16 compression_type=zlib >>> == Check encryption option == >>> qemu-img create -f qcow2 -o encryption=off TEST_DIR/t.qcow2 64M >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> encryption=off cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> encryption=off cluster_size=65536 lazy_refcounts=off >>> refcount_bits=16 compression_type=zlib >>> qemu-img create -f qcow2 --object secret,id=sec0,data=123456 -o >>> encryption=on,encrypt.key-secret=sec0 TEST_DIR/t.qcow2 64M >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> encryption=on encrypt.key-secret=sec0 cluster_size=65536 >>> lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 >>> encryption=on encrypt.key-secret=sec0 cluster_size=65536 >>> lazy_refcounts=off refcount_bits=16 compression_type=zlib >>> == Check lazy_refcounts option (only with v3) == >>> qemu-img create -f qcow2 -o compat=1.1,lazy_refcounts=off >>> TEST_DIR/t.qcow2 64M >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 -o compat=1.1,lazy_refcounts=on >>> TEST_DIR/t.qcow2 64M >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 >>> cluster_size=65536 lazy_refcounts=on refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 >>> cluster_size=65536 lazy_refcounts=on refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 -o compat=0.10,lazy_refcounts=off >>> TEST_DIR/t.qcow2 64M >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> qemu-img create -f qcow2 -o compat=0.10,lazy_refcounts=on >>> TEST_DIR/t.qcow2 64M >>> qemu-img: TEST_DIR/t.qcow2: Lazy refcounts only supported with >>> compatibility level 1.1 and above (use version=v3 or greater) >>> -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 >>> cluster_size=65536 lazy_refcounts=on refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 >>> cluster_size=65536 lazy_refcounts=on refcount_bits=16 >>> compression_type=zlib >>> *** done >>> diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out >>> index d27692a33c..3e47f537e8 100644 >>> --- a/tests/qemu-iotests/060.out >>> +++ b/tests/qemu-iotests/060.out >>> @@ -17,6 +17,7 @@ virtual size: 64 MiB (67108864 bytes) >>> cluster_size: 65536 >>> Format specific information: >>> compat: 1.1 >>> + compression type: zlib >>> lazy refcounts: false >>> refcount bits: 16 >>> corrupt: true >>> diff --git a/tests/qemu-iotests/061.out b/tests/qemu-iotests/061.out >>> index cea7fedfdc..c913f02ad6 100644 >>> --- a/tests/qemu-iotests/061.out >>> +++ b/tests/qemu-iotests/061.out >>> @@ -491,6 +491,7 @@ virtual size: 64 MiB (67108864 bytes) >>> cluster_size: 65536 >>> Format specific information: >>> compat: 1.1 >>> + compression type: zlib >>> lazy refcounts: false >>> refcount bits: 16 >>> data file: TEST_DIR/t.IMGFMT.data >>> @@ -511,6 +512,7 @@ virtual size: 64 MiB (67108864 bytes) >>> cluster_size: 65536 >>> Format specific information: >>> compat: 1.1 >>> + compression type: zlib >>> lazy refcounts: false >>> refcount bits: 16 >>> data file: foo >>> @@ -524,6 +526,7 @@ virtual size: 64 MiB (67108864 bytes) >>> cluster_size: 65536 >>> Format specific information: >>> compat: 1.1 >>> + compression type: zlib >>> lazy refcounts: false >>> refcount bits: 16 >>> data file raw: false >>> @@ -538,6 +541,7 @@ virtual size: 64 MiB (67108864 bytes) >>> cluster_size: 65536 >>> Format specific information: >>> compat: 1.1 >>> + compression type: zlib >>> lazy refcounts: false >>> refcount bits: 16 >>> data file: TEST_DIR/t.IMGFMT.data >>> @@ -550,6 +554,7 @@ virtual size: 64 MiB (67108864 bytes) >>> cluster_size: 65536 >>> Format specific information: >>> compat: 1.1 >>> + compression type: zlib >>> lazy refcounts: false >>> refcount bits: 16 >>> data file: TEST_DIR/t.IMGFMT.data >>> @@ -563,6 +568,7 @@ virtual size: 64 MiB (67108864 bytes) >>> cluster_size: 65536 >>> Format specific information: >>> compat: 1.1 >>> + compression type: zlib >>> lazy refcounts: false >>> refcount bits: 16 >>> data file: TEST_DIR/t.IMGFMT.data >>> diff --git a/tests/qemu-iotests/065 b/tests/qemu-iotests/065 >>> index 6426474271..106303b5a5 100755 >>> --- a/tests/qemu-iotests/065 >>> +++ b/tests/qemu-iotests/065 >>> @@ -88,23 +88,25 @@ class TestQMP(TestImageInfoSpecific): >>> class TestQCow2(TestQemuImgInfo): >>> '''Testing a qcow2 version 2 image''' >>> img_options = 'compat=0.10' >>> - json_compare = { 'compat': '0.10', 'refcount-bits': 16 } >>> - human_compare = [ 'compat: 0.10', 'refcount bits: 16' ] >>> + json_compare = { 'compat': '0.10', 'refcount-bits': 16, >>> 'compression-type': 'zlib' } >>> + human_compare = [ 'compat: 0.10', 'compression type: zlib', >>> 'refcount bits: 16' ] >>> class TestQCow3NotLazy(TestQemuImgInfo): >>> '''Testing a qcow2 version 3 image with lazy refcounts >>> disabled''' >>> img_options = 'compat=1.1,lazy_refcounts=off' >>> json_compare = { 'compat': '1.1', 'lazy-refcounts': False, >>> - 'refcount-bits': 16, 'corrupt': False } >>> - human_compare = [ 'compat: 1.1', 'lazy refcounts: false', >>> + 'refcount-bits': 16, 'corrupt': False, >>> + 'compression-type': 'zlib' } >>> + human_compare = [ 'compat: 1.1', 'compression type: zlib', >>> 'lazy refcounts: false', >>> 'refcount bits: 16', 'corrupt: false' ] >>> class TestQCow3Lazy(TestQemuImgInfo): >>> '''Testing a qcow2 version 3 image with lazy refcounts enabled''' >>> img_options = 'compat=1.1,lazy_refcounts=on' >>> json_compare = { 'compat': '1.1', 'lazy-refcounts': True, >>> - 'refcount-bits': 16, 'corrupt': False } >>> - human_compare = [ 'compat: 1.1', 'lazy refcounts: true', >>> + 'refcount-bits': 16, 'corrupt': False, >>> + 'compression-type': 'zlib' } >>> + human_compare = [ 'compat: 1.1', 'compression type: zlib', >>> 'lazy refcounts: true', >>> 'refcount bits: 16', 'corrupt: false' ] >>> class TestQCow3NotLazyQMP(TestQMP): >>> @@ -113,7 +115,8 @@ class TestQCow3NotLazyQMP(TestQMP): >>> img_options = 'compat=1.1,lazy_refcounts=off' >>> qemu_options = 'lazy-refcounts=on' >>> compare = { 'compat': '1.1', 'lazy-refcounts': False, >>> - 'refcount-bits': 16, 'corrupt': False } >>> + 'refcount-bits': 16, 'corrupt': False, >>> + 'compression-type': 'zlib' } >>> class TestQCow3LazyQMP(TestQMP): >>> @@ -122,7 +125,8 @@ class TestQCow3LazyQMP(TestQMP): >>> img_options = 'compat=1.1,lazy_refcounts=on' >>> qemu_options = 'lazy-refcounts=off' >>> compare = { 'compat': '1.1', 'lazy-refcounts': True, >>> - 'refcount-bits': 16, 'corrupt': False } >>> + 'refcount-bits': 16, 'corrupt': False, >>> + 'compression-type': 'zlib' } >>> TestImageInfoSpecific = None >>> TestQemuImgInfo = None >>> diff --git a/tests/qemu-iotests/144.out b/tests/qemu-iotests/144.out >>> index c7aa2e4820..885a8874a5 100644 >>> --- a/tests/qemu-iotests/144.out >>> +++ b/tests/qemu-iotests/144.out >>> @@ -9,7 +9,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT >>> size=536870912 >>> { 'execute': 'qmp_capabilities' } >>> {"return": {}} >>> { 'execute': 'blockdev-snapshot-sync', 'arguments': { 'device': >>> 'virtio0', 'snapshot-file':'TEST_DIR/tmp.IMGFMT', 'format': 'IMGFMT' >>> } } >>> -Formatting 'TEST_DIR/tmp.qcow2', fmt=qcow2 size=536870912 >>> backing_file=TEST_DIR/t.qcow2 backing_fmt=qcow2 cluster_size=65536 >>> lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/tmp.qcow2', fmt=qcow2 size=536870912 >>> backing_file=TEST_DIR/t.qcow2 backing_fmt=qcow2 cluster_size=65536 >>> lazy_refcounts=off refcount_bits=16 compression_type=zlib >>> {"return": {}} >>> === Performing block-commit on active layer === >>> @@ -31,6 +31,6 @@ Formatting 'TEST_DIR/tmp.qcow2', fmt=qcow2 >>> size=536870912 backing_file=TEST_DIR/ >>> === Performing Live Snapshot 2 === >>> { 'execute': 'blockdev-snapshot-sync', 'arguments': { 'device': >>> 'virtio0', 'snapshot-file':'TEST_DIR/tmp2.IMGFMT', 'format': >>> 'IMGFMT' } } >>> -Formatting 'TEST_DIR/tmp2.qcow2', fmt=qcow2 size=536870912 >>> backing_file=TEST_DIR/t.qcow2 backing_fmt=qcow2 cluster_size=65536 >>> lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/tmp2.qcow2', fmt=qcow2 size=536870912 >>> backing_file=TEST_DIR/t.qcow2 backing_fmt=qcow2 cluster_size=65536 >>> lazy_refcounts=off refcount_bits=16 compression_type=zlib >>> {"return": {}} >>> *** done >>> diff --git a/tests/qemu-iotests/182.out b/tests/qemu-iotests/182.out >>> index a8eea166c3..ae43654d32 100644 >>> --- a/tests/qemu-iotests/182.out >>> +++ b/tests/qemu-iotests/182.out >>> @@ -13,7 +13,7 @@ Is another process using the image >>> [TEST_DIR/t.qcow2]? >>> {'execute': 'blockdev-add', 'arguments': { 'node-name': 'node0', >>> 'driver': 'file', 'filename': 'TEST_DIR/t.IMGFMT', 'locking': 'on' } } >>> {"return": {}} >>> {'execute': 'blockdev-snapshot-sync', 'arguments': { 'node-name': >>> 'node0', 'snapshot-file': 'TEST_DIR/t.IMGFMT.overlay', >>> 'snapshot-node-name': 'node1' } } >>> -Formatting 'TEST_DIR/t.qcow2.overlay', fmt=qcow2 size=197120 >>> backing_file=TEST_DIR/t.qcow2 backing_fmt=file cluster_size=65536 >>> lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/t.qcow2.overlay', fmt=qcow2 size=197120 >>> backing_file=TEST_DIR/t.qcow2 backing_fmt=file cluster_size=65536 >>> lazy_refcounts=off refcount_bits=16 compression_type=zlib >>> {"return": {}} >>> {'execute': 'blockdev-add', 'arguments': { 'node-name': 'node1', >>> 'driver': 'file', 'filename': 'TEST_DIR/t.IMGFMT', 'locking': 'on' } } >>> {"return": {}} >>> diff --git a/tests/qemu-iotests/242.out b/tests/qemu-iotests/242.out >>> index 7ac8404d11..091b9126ce 100644 >>> --- a/tests/qemu-iotests/242.out >>> +++ b/tests/qemu-iotests/242.out >>> @@ -12,6 +12,7 @@ virtual size: 1 MiB (1048576 bytes) >>> cluster_size: 65536 >>> Format specific information: >>> compat: 1.1 >>> + compression type: zlib >>> lazy refcounts: false >>> refcount bits: 16 >>> corrupt: false >>> @@ -32,6 +33,7 @@ virtual size: 1 MiB (1048576 bytes) >>> cluster_size: 65536 >>> Format specific information: >>> compat: 1.1 >>> + compression type: zlib >>> lazy refcounts: false >>> bitmaps: >>> [0]: >>> @@ -64,6 +66,7 @@ virtual size: 1 MiB (1048576 bytes) >>> cluster_size: 65536 >>> Format specific information: >>> compat: 1.1 >>> + compression type: zlib >>> lazy refcounts: false >>> bitmaps: >>> [0]: >>> @@ -104,6 +107,7 @@ virtual size: 1 MiB (1048576 bytes) >>> cluster_size: 65536 >>> Format specific information: >>> compat: 1.1 >>> + compression type: zlib >>> lazy refcounts: false >>> bitmaps: >>> [0]: >>> @@ -153,6 +157,7 @@ virtual size: 1 MiB (1048576 bytes) >>> cluster_size: 65536 >>> Format specific information: >>> compat: 1.1 >>> + compression type: zlib >>> lazy refcounts: false >>> bitmaps: >>> [0]: >>> diff --git a/tests/qemu-iotests/255.out b/tests/qemu-iotests/255.out >>> index 348909fdef..a3c99fd62e 100644 >>> --- a/tests/qemu-iotests/255.out >>> +++ b/tests/qemu-iotests/255.out >>> @@ -3,9 +3,9 @@ Finishing a commit job with background reads >>> === Create backing chain and start VM === >>> -Formatting 'TEST_DIR/PID-t.qcow2.mid', fmt=qcow2 size=134217728 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/PID-t.qcow2.mid', fmt=qcow2 size=134217728 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> -Formatting 'TEST_DIR/PID-t.qcow2', fmt=qcow2 size=134217728 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/PID-t.qcow2', fmt=qcow2 size=134217728 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> === Start background read requests === >>> @@ -23,9 +23,9 @@ Closing the VM while a job is being cancelled >>> === Create images and start VM === >>> -Formatting 'TEST_DIR/PID-src.qcow2', fmt=qcow2 size=134217728 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/PID-src.qcow2', fmt=qcow2 size=134217728 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> -Formatting 'TEST_DIR/PID-dst.qcow2', fmt=qcow2 size=134217728 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> +Formatting 'TEST_DIR/PID-dst.qcow2', fmt=qcow2 size=134217728 >>> cluster_size=65536 lazy_refcounts=off refcount_bits=16 >>> compression_type=zlib >>> wrote 1048576/1048576 bytes at offset 0 >>> 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) >>> >> >> > >
diff --git a/tests/qemu-iotests/049.out b/tests/qemu-iotests/049.out index affa55b341..a5cfba1756 100644 --- a/tests/qemu-iotests/049.out +++ b/tests/qemu-iotests/049.out @@ -4,90 +4,90 @@ QA output created by 049 == 1. Traditional size parameter == qemu-img create -f qcow2 TEST_DIR/t.qcow2 1024 -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 TEST_DIR/t.qcow2 1024b -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 TEST_DIR/t.qcow2 1k -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 TEST_DIR/t.qcow2 1K -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 TEST_DIR/t.qcow2 1M -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1048576 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1048576 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 TEST_DIR/t.qcow2 1G -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1073741824 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1073741824 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 TEST_DIR/t.qcow2 1T -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1099511627776 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1099511627776 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 TEST_DIR/t.qcow2 1024.0 -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 TEST_DIR/t.qcow2 1024.0b -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 TEST_DIR/t.qcow2 1.5k -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 TEST_DIR/t.qcow2 1.5K -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 TEST_DIR/t.qcow2 1.5M -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1572864 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1572864 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 TEST_DIR/t.qcow2 1.5G -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1610612736 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1610612736 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 TEST_DIR/t.qcow2 1.5T -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1649267441664 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1649267441664 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib == 2. Specifying size via -o == qemu-img create -f qcow2 -o size=1024 TEST_DIR/t.qcow2 -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o size=1024b TEST_DIR/t.qcow2 -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o size=1k TEST_DIR/t.qcow2 -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o size=1K TEST_DIR/t.qcow2 -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o size=1M TEST_DIR/t.qcow2 -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1048576 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1048576 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o size=1G TEST_DIR/t.qcow2 -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1073741824 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1073741824 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o size=1T TEST_DIR/t.qcow2 -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1099511627776 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1099511627776 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o size=1024.0 TEST_DIR/t.qcow2 -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o size=1024.0b TEST_DIR/t.qcow2 -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1024 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o size=1.5k TEST_DIR/t.qcow2 -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o size=1.5K TEST_DIR/t.qcow2 -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1536 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o size=1.5M TEST_DIR/t.qcow2 -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1572864 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1572864 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o size=1.5G TEST_DIR/t.qcow2 -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1610612736 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1610612736 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o size=1.5T TEST_DIR/t.qcow2 -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1649267441664 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=1649267441664 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib == 3. Invalid sizes == @@ -129,84 +129,84 @@ qemu-img: TEST_DIR/t.qcow2: The image size must be specified only once == Check correct interpretation of suffixes for cluster size == qemu-img create -f qcow2 -o cluster_size=1024 TEST_DIR/t.qcow2 64M -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o cluster_size=1024b TEST_DIR/t.qcow2 64M -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o cluster_size=1k TEST_DIR/t.qcow2 64M -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o cluster_size=1K TEST_DIR/t.qcow2 64M -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o cluster_size=1M TEST_DIR/t.qcow2 64M -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1048576 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1048576 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o cluster_size=1024.0 TEST_DIR/t.qcow2 64M -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o cluster_size=1024.0b TEST_DIR/t.qcow2 64M -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=1024 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o cluster_size=0.5k TEST_DIR/t.qcow2 64M -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=512 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=512 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o cluster_size=0.5K TEST_DIR/t.qcow2 64M -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=512 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=512 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o cluster_size=0.5M TEST_DIR/t.qcow2 64M -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=524288 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=524288 lazy_refcounts=off refcount_bits=16 compression_type=zlib == Check compat level option == qemu-img create -f qcow2 -o compat=0.10 TEST_DIR/t.qcow2 64M -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o compat=1.1 TEST_DIR/t.qcow2 64M -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o compat=0.42 TEST_DIR/t.qcow2 64M qemu-img: TEST_DIR/t.qcow2: Invalid parameter '0.42' -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.42 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.42 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o compat=foobar TEST_DIR/t.qcow2 64M qemu-img: TEST_DIR/t.qcow2: Invalid parameter 'foobar' -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=foobar cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=foobar cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib == Check preallocation option == qemu-img create -f qcow2 -o preallocation=off TEST_DIR/t.qcow2 64M -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=65536 preallocation=off lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=65536 preallocation=off lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o preallocation=metadata TEST_DIR/t.qcow2 64M -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=65536 preallocation=metadata lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=65536 preallocation=metadata lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o preallocation=1234 TEST_DIR/t.qcow2 64M qemu-img: TEST_DIR/t.qcow2: Invalid parameter '1234' -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=65536 preallocation=1234 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 cluster_size=65536 preallocation=1234 lazy_refcounts=off refcount_bits=16 compression_type=zlib == Check encryption option == qemu-img create -f qcow2 -o encryption=off TEST_DIR/t.qcow2 64M -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 encryption=off cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 encryption=off cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 --object secret,id=sec0,data=123456 -o encryption=on,encrypt.key-secret=sec0 TEST_DIR/t.qcow2 64M -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 encryption=on encrypt.key-secret=sec0 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 encryption=on encrypt.key-secret=sec0 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib == Check lazy_refcounts option (only with v3) == qemu-img create -f qcow2 -o compat=1.1,lazy_refcounts=off TEST_DIR/t.qcow2 64M -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o compat=1.1,lazy_refcounts=on TEST_DIR/t.qcow2 64M -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 cluster_size=65536 lazy_refcounts=on refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=1.1 cluster_size=65536 lazy_refcounts=on refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o compat=0.10,lazy_refcounts=off TEST_DIR/t.qcow2 64M -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib qemu-img create -f qcow2 -o compat=0.10,lazy_refcounts=on TEST_DIR/t.qcow2 64M qemu-img: TEST_DIR/t.qcow2: Lazy refcounts only supported with compatibility level 1.1 and above (use version=v3 or greater) -Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 cluster_size=65536 lazy_refcounts=on refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=67108864 compat=0.10 cluster_size=65536 lazy_refcounts=on refcount_bits=16 compression_type=zlib *** done diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out index d27692a33c..3e47f537e8 100644 --- a/tests/qemu-iotests/060.out +++ b/tests/qemu-iotests/060.out @@ -17,6 +17,7 @@ virtual size: 64 MiB (67108864 bytes) cluster_size: 65536 Format specific information: compat: 1.1 + compression type: zlib lazy refcounts: false refcount bits: 16 corrupt: true diff --git a/tests/qemu-iotests/061.out b/tests/qemu-iotests/061.out index cea7fedfdc..c913f02ad6 100644 --- a/tests/qemu-iotests/061.out +++ b/tests/qemu-iotests/061.out @@ -491,6 +491,7 @@ virtual size: 64 MiB (67108864 bytes) cluster_size: 65536 Format specific information: compat: 1.1 + compression type: zlib lazy refcounts: false refcount bits: 16 data file: TEST_DIR/t.IMGFMT.data @@ -511,6 +512,7 @@ virtual size: 64 MiB (67108864 bytes) cluster_size: 65536 Format specific information: compat: 1.1 + compression type: zlib lazy refcounts: false refcount bits: 16 data file: foo @@ -524,6 +526,7 @@ virtual size: 64 MiB (67108864 bytes) cluster_size: 65536 Format specific information: compat: 1.1 + compression type: zlib lazy refcounts: false refcount bits: 16 data file raw: false @@ -538,6 +541,7 @@ virtual size: 64 MiB (67108864 bytes) cluster_size: 65536 Format specific information: compat: 1.1 + compression type: zlib lazy refcounts: false refcount bits: 16 data file: TEST_DIR/t.IMGFMT.data @@ -550,6 +554,7 @@ virtual size: 64 MiB (67108864 bytes) cluster_size: 65536 Format specific information: compat: 1.1 + compression type: zlib lazy refcounts: false refcount bits: 16 data file: TEST_DIR/t.IMGFMT.data @@ -563,6 +568,7 @@ virtual size: 64 MiB (67108864 bytes) cluster_size: 65536 Format specific information: compat: 1.1 + compression type: zlib lazy refcounts: false refcount bits: 16 data file: TEST_DIR/t.IMGFMT.data diff --git a/tests/qemu-iotests/065 b/tests/qemu-iotests/065 index 6426474271..106303b5a5 100755 --- a/tests/qemu-iotests/065 +++ b/tests/qemu-iotests/065 @@ -88,23 +88,25 @@ class TestQMP(TestImageInfoSpecific): class TestQCow2(TestQemuImgInfo): '''Testing a qcow2 version 2 image''' img_options = 'compat=0.10' - json_compare = { 'compat': '0.10', 'refcount-bits': 16 } - human_compare = [ 'compat: 0.10', 'refcount bits: 16' ] + json_compare = { 'compat': '0.10', 'refcount-bits': 16, 'compression-type': 'zlib' } + human_compare = [ 'compat: 0.10', 'compression type: zlib', 'refcount bits: 16' ] class TestQCow3NotLazy(TestQemuImgInfo): '''Testing a qcow2 version 3 image with lazy refcounts disabled''' img_options = 'compat=1.1,lazy_refcounts=off' json_compare = { 'compat': '1.1', 'lazy-refcounts': False, - 'refcount-bits': 16, 'corrupt': False } - human_compare = [ 'compat: 1.1', 'lazy refcounts: false', + 'refcount-bits': 16, 'corrupt': False, + 'compression-type': 'zlib' } + human_compare = [ 'compat: 1.1', 'compression type: zlib', 'lazy refcounts: false', 'refcount bits: 16', 'corrupt: false' ] class TestQCow3Lazy(TestQemuImgInfo): '''Testing a qcow2 version 3 image with lazy refcounts enabled''' img_options = 'compat=1.1,lazy_refcounts=on' json_compare = { 'compat': '1.1', 'lazy-refcounts': True, - 'refcount-bits': 16, 'corrupt': False } - human_compare = [ 'compat: 1.1', 'lazy refcounts: true', + 'refcount-bits': 16, 'corrupt': False, + 'compression-type': 'zlib' } + human_compare = [ 'compat: 1.1', 'compression type: zlib', 'lazy refcounts: true', 'refcount bits: 16', 'corrupt: false' ] class TestQCow3NotLazyQMP(TestQMP): @@ -113,7 +115,8 @@ class TestQCow3NotLazyQMP(TestQMP): img_options = 'compat=1.1,lazy_refcounts=off' qemu_options = 'lazy-refcounts=on' compare = { 'compat': '1.1', 'lazy-refcounts': False, - 'refcount-bits': 16, 'corrupt': False } + 'refcount-bits': 16, 'corrupt': False, + 'compression-type': 'zlib' } class TestQCow3LazyQMP(TestQMP): @@ -122,7 +125,8 @@ class TestQCow3LazyQMP(TestQMP): img_options = 'compat=1.1,lazy_refcounts=on' qemu_options = 'lazy-refcounts=off' compare = { 'compat': '1.1', 'lazy-refcounts': True, - 'refcount-bits': 16, 'corrupt': False } + 'refcount-bits': 16, 'corrupt': False, + 'compression-type': 'zlib' } TestImageInfoSpecific = None TestQemuImgInfo = None diff --git a/tests/qemu-iotests/144.out b/tests/qemu-iotests/144.out index c7aa2e4820..885a8874a5 100644 --- a/tests/qemu-iotests/144.out +++ b/tests/qemu-iotests/144.out @@ -9,7 +9,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=536870912 { 'execute': 'qmp_capabilities' } {"return": {}} { 'execute': 'blockdev-snapshot-sync', 'arguments': { 'device': 'virtio0', 'snapshot-file':'TEST_DIR/tmp.IMGFMT', 'format': 'IMGFMT' } } -Formatting 'TEST_DIR/tmp.qcow2', fmt=qcow2 size=536870912 backing_file=TEST_DIR/t.qcow2 backing_fmt=qcow2 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/tmp.qcow2', fmt=qcow2 size=536870912 backing_file=TEST_DIR/t.qcow2 backing_fmt=qcow2 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib {"return": {}} === Performing block-commit on active layer === @@ -31,6 +31,6 @@ Formatting 'TEST_DIR/tmp.qcow2', fmt=qcow2 size=536870912 backing_file=TEST_DIR/ === Performing Live Snapshot 2 === { 'execute': 'blockdev-snapshot-sync', 'arguments': { 'device': 'virtio0', 'snapshot-file':'TEST_DIR/tmp2.IMGFMT', 'format': 'IMGFMT' } } -Formatting 'TEST_DIR/tmp2.qcow2', fmt=qcow2 size=536870912 backing_file=TEST_DIR/t.qcow2 backing_fmt=qcow2 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/tmp2.qcow2', fmt=qcow2 size=536870912 backing_file=TEST_DIR/t.qcow2 backing_fmt=qcow2 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib {"return": {}} *** done diff --git a/tests/qemu-iotests/182.out b/tests/qemu-iotests/182.out index a8eea166c3..ae43654d32 100644 --- a/tests/qemu-iotests/182.out +++ b/tests/qemu-iotests/182.out @@ -13,7 +13,7 @@ Is another process using the image [TEST_DIR/t.qcow2]? {'execute': 'blockdev-add', 'arguments': { 'node-name': 'node0', 'driver': 'file', 'filename': 'TEST_DIR/t.IMGFMT', 'locking': 'on' } } {"return": {}} {'execute': 'blockdev-snapshot-sync', 'arguments': { 'node-name': 'node0', 'snapshot-file': 'TEST_DIR/t.IMGFMT.overlay', 'snapshot-node-name': 'node1' } } -Formatting 'TEST_DIR/t.qcow2.overlay', fmt=qcow2 size=197120 backing_file=TEST_DIR/t.qcow2 backing_fmt=file cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/t.qcow2.overlay', fmt=qcow2 size=197120 backing_file=TEST_DIR/t.qcow2 backing_fmt=file cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib {"return": {}} {'execute': 'blockdev-add', 'arguments': { 'node-name': 'node1', 'driver': 'file', 'filename': 'TEST_DIR/t.IMGFMT', 'locking': 'on' } } {"return": {}} diff --git a/tests/qemu-iotests/242.out b/tests/qemu-iotests/242.out index 7ac8404d11..091b9126ce 100644 --- a/tests/qemu-iotests/242.out +++ b/tests/qemu-iotests/242.out @@ -12,6 +12,7 @@ virtual size: 1 MiB (1048576 bytes) cluster_size: 65536 Format specific information: compat: 1.1 + compression type: zlib lazy refcounts: false refcount bits: 16 corrupt: false @@ -32,6 +33,7 @@ virtual size: 1 MiB (1048576 bytes) cluster_size: 65536 Format specific information: compat: 1.1 + compression type: zlib lazy refcounts: false bitmaps: [0]: @@ -64,6 +66,7 @@ virtual size: 1 MiB (1048576 bytes) cluster_size: 65536 Format specific information: compat: 1.1 + compression type: zlib lazy refcounts: false bitmaps: [0]: @@ -104,6 +107,7 @@ virtual size: 1 MiB (1048576 bytes) cluster_size: 65536 Format specific information: compat: 1.1 + compression type: zlib lazy refcounts: false bitmaps: [0]: @@ -153,6 +157,7 @@ virtual size: 1 MiB (1048576 bytes) cluster_size: 65536 Format specific information: compat: 1.1 + compression type: zlib lazy refcounts: false bitmaps: [0]: diff --git a/tests/qemu-iotests/255.out b/tests/qemu-iotests/255.out index 348909fdef..a3c99fd62e 100644 --- a/tests/qemu-iotests/255.out +++ b/tests/qemu-iotests/255.out @@ -3,9 +3,9 @@ Finishing a commit job with background reads === Create backing chain and start VM === -Formatting 'TEST_DIR/PID-t.qcow2.mid', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-t.qcow2.mid', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib -Formatting 'TEST_DIR/PID-t.qcow2', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-t.qcow2', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib === Start background read requests === @@ -23,9 +23,9 @@ Closing the VM while a job is being cancelled === Create images and start VM === -Formatting 'TEST_DIR/PID-src.qcow2', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-src.qcow2', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib -Formatting 'TEST_DIR/PID-dst.qcow2', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16 +Formatting 'TEST_DIR/PID-dst.qcow2', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16 compression_type=zlib wrote 1048576/1048576 bytes at offset 0 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
Affected tests: 049, 060, 061, 065, 144, 182, 242, 255 After adding the compression type feature for qcow2, the compression type is reported on image quering. Add the corresponding values of the "compression type" for the tests' output matching. Signed-off-by: Denis Plotnikov <dplotnikov@virtuozzo.com> --- tests/qemu-iotests/049.out | 102 ++++++++++++++++++------------------- tests/qemu-iotests/060.out | 1 + tests/qemu-iotests/061.out | 6 +++ tests/qemu-iotests/065 | 20 +++++--- tests/qemu-iotests/144.out | 4 +- tests/qemu-iotests/182.out | 2 +- tests/qemu-iotests/242.out | 5 ++ tests/qemu-iotests/255.out | 8 +-- 8 files changed, 82 insertions(+), 66 deletions(-)