On Thu, 2020-05-14 at 16:49 +0200, Max Reitz wrote: > On 10.05.20 15:40, Maxim Levitsky wrote: > > This allows more tests to be able to have same output on both qcow2 luks > > encrypted images > > and raw luks images > > > > Signed-off-by: Maxim Levitsky <mlevi...@redhat.com> > > Reviewed-by: Daniel P. Berrangé <berra...@redhat.com> > > --- > > tests/qemu-iotests/087.out | 6 ++--- > > tests/qemu-iotests/134.out | 2 +- > > tests/qemu-iotests/158.out | 4 +-- > > tests/qemu-iotests/188.out | 2 +- > > tests/qemu-iotests/189.out | 4 +-- > > tests/qemu-iotests/198.out | 4 +-- > > tests/qemu-iotests/263.out | 4 +-- > > tests/qemu-iotests/274.out | 46 ++++++++++++++++---------------- > > tests/qemu-iotests/284.out | 6 ++--- > > tests/qemu-iotests/common.filter | 6 +++-- > > 10 files changed, 43 insertions(+), 41 deletions(-) > > [...] > > > diff --git a/tests/qemu-iotests/274.out b/tests/qemu-iotests/274.out > > index 9d6fdeb1f7..59de176b99 100644 > > --- a/tests/qemu-iotests/274.out > > +++ b/tests/qemu-iotests/274.out > > @@ -1,9 +1,9 @@ > > == Commit tests == > > -Formatting 'TEST_DIR/PID-base', fmt=qcow2 size=2097152 cluster_size=65536 > > lazy_refcounts=off refcount_bits=16 > > +Formatting 'TEST_DIR/PID-base', fmt=qcow2 cluster_size=65536 size=2097152 > > lazy_refcounts=off refcount_bits=16 > > > > -Formatting 'TEST_DIR/PID-mid', fmt=qcow2 size=1048576 > > backing_file=TEST_DIR/PID-base cluster_size=65536 lazy_refcounts=off > > refcount_bits=16 > > +Formatting 'TEST_DIR/PID-mid', fmt=qcow2 cluster_size=65536 size=1048576 > > backing_file=TEST_DIR/PID-base lazy_refcounts=off refcount_bits=16 > > > > -Formatting 'TEST_DIR/PID-top', fmt=qcow2 size=2097152 > > backing_file=TEST_DIR/PID-mid cluster_size=65536 lazy_refcounts=off > > refcount_bits=16 > > +Formatting 'TEST_DIR/PID-top', fmt=qcow2 cluster_size=65536 size=2097152 > > backing_file=TEST_DIR/PID-mid lazy_refcounts=off refcount_bits=16 > > @size and @cluster_size swapping positions doesn’t look right for this > patch. I think all hunks for 274.out should be in patch 5. Fixed
> > Max > Best regards, Maxim Levitsky