From: Maxim Levitsky <mlevitsk@redhat.com>
To: Max Reitz <mreitz@redhat.com>, qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, qemu-devel@nongnu.org
Subject: Re: [PATCH v2 04/21] iotests: Filter refcount_order in 036
Date: Wed, 06 Nov 2019 17:45:01 +0200 [thread overview]
Message-ID: <a7a253f60f3286e9826d83c61ab540a76b356f20.camel@redhat.com> (raw)
In-Reply-To: <20191015142729.18123-5-mreitz@redhat.com>
On Tue, 2019-10-15 at 16:27 +0200, Max Reitz wrote:
> This test can run just fine with other values for refcount_bits, so we
> should filter the value from qcow2.py's dump-header. In fact, we can
> filter everything but the feature bits and header extensions, because
> that is what the test is about.
>
> (036 currently ignores user-specified image options, but that will be
> fixed in the next patch.)
>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> tests/qemu-iotests/036 | 9 ++++---
> tests/qemu-iotests/036.out | 48 --------------------------------------
> 2 files changed, 6 insertions(+), 51 deletions(-)
>
> diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
> index f06ff67408..5f929ad3be 100755
> --- a/tests/qemu-iotests/036
> +++ b/tests/qemu-iotests/036
> @@ -55,7 +55,8 @@ $PYTHON qcow2.py "$TEST_IMG" set-feature-bit incompatible 63
>
> # Without feature table
> $PYTHON qcow2.py "$TEST_IMG" del-header-ext 0x6803f857
> -$PYTHON qcow2.py "$TEST_IMG" dump-header
> +$PYTHON qcow2.py "$TEST_IMG" dump-header | grep features
> +$PYTHON qcow2.py "$TEST_IMG" dump-header-exts
> _img_info
>
> # With feature table containing bit 63
> @@ -103,14 +104,16 @@ echo === Create image with unknown autoclear feature bit ===
> echo
> _make_test_img 64M
> $PYTHON qcow2.py "$TEST_IMG" set-feature-bit autoclear 63
> -$PYTHON qcow2.py "$TEST_IMG" dump-header
> +$PYTHON qcow2.py "$TEST_IMG" dump-header | grep features
> +$PYTHON qcow2.py "$TEST_IMG" dump-header-exts
>
> echo
> echo === Repair image ===
> echo
> _check_test_img -r all
>
> -$PYTHON qcow2.py "$TEST_IMG" dump-header
> +$PYTHON qcow2.py "$TEST_IMG" dump-header | grep features
> +$PYTHON qcow2.py "$TEST_IMG" dump-header-exts
>
> # success, all done
> echo "*** done"
> diff --git a/tests/qemu-iotests/036.out b/tests/qemu-iotests/036.out
> index 15229a9604..0b52b934e1 100644
> --- a/tests/qemu-iotests/036.out
> +++ b/tests/qemu-iotests/036.out
> @@ -3,25 +3,9 @@ QA output created by 036
> === Image with unknown incompatible feature bit ===
>
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> -magic 0x514649fb
> -version 3
> -backing_file_offset 0x0
> -backing_file_size 0x0
> -cluster_bits 16
> -size 67108864
> -crypt_method 0
> -l1_size 1
> -l1_table_offset 0x30000
> -refcount_table_offset 0x10000
> -refcount_table_clusters 1
> -nb_snapshots 0
> -snapshot_offset 0x0
> incompatible_features [63]
> compatible_features []
> autoclear_features []
> -refcount_order 4
> -header_length 104
> -
> qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported IMGFMT feature(s): Unknown incompatible feature: 8000000000000000
> qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported IMGFMT feature(s): Test feature
>
> @@ -37,25 +21,9 @@ qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported IMGFMT feature(s): tes
> === Create image with unknown autoclear feature bit ===
>
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> -magic 0x514649fb
> -version 3
> -backing_file_offset 0x0
> -backing_file_size 0x0
> -cluster_bits 16
> -size 67108864
> -crypt_method 0
> -l1_size 1
> -l1_table_offset 0x30000
> -refcount_table_offset 0x10000
> -refcount_table_clusters 1
> -nb_snapshots 0
> -snapshot_offset 0x0
> incompatible_features []
> compatible_features []
> autoclear_features [63]
> -refcount_order 4
> -header_length 104
> -
> Header extension:
> magic 0x6803f857
> length 192
> @@ -65,25 +33,9 @@ data <binary>
> === Repair image ===
>
> No errors were found on the image.
> -magic 0x514649fb
> -version 3
> -backing_file_offset 0x0
> -backing_file_size 0x0
> -cluster_bits 16
> -size 67108864
> -crypt_method 0
> -l1_size 1
> -l1_table_offset 0x30000
> -refcount_table_offset 0x10000
> -refcount_table_clusters 1
> -nb_snapshots 0
> -snapshot_offset 0x0
> incompatible_features []
> compatible_features []
> autoclear_features []
> -refcount_order 4
> -header_length 104
> -
> Header extension:
> magic 0x6803f857
> length 192
Great!
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Best regards,
Maxim Levitsky
next prev parent reply other threads:[~2019-11-06 15:47 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-15 14:27 [PATCH v2 00/21] iotests: Allow ./check -o data_file Max Reitz
2019-10-15 14:27 ` [PATCH v2 01/21] iotests/qcow2.py: Add dump-header-exts Max Reitz
2019-11-06 15:37 ` Maxim Levitsky
2019-10-15 14:27 ` [PATCH v2 02/21] iotests/qcow2.py: Split feature fields into bits Max Reitz
2019-11-06 15:37 ` Maxim Levitsky
2019-10-15 14:27 ` [PATCH v2 03/21] iotests: Add _filter_json_filename Max Reitz
2019-11-06 15:44 ` Maxim Levitsky
2019-11-07 8:59 ` Max Reitz
2019-11-07 10:01 ` Maxim Levitsky
2019-10-15 14:27 ` [PATCH v2 04/21] iotests: Filter refcount_order in 036 Max Reitz
2019-11-06 15:45 ` Maxim Levitsky [this message]
2019-10-15 14:27 ` [PATCH v2 05/21] iotests: Replace IMGOPTS by _unsupported_imgopts Max Reitz
2019-11-06 15:45 ` Maxim Levitsky
2019-11-07 9:08 ` Max Reitz
2019-11-07 9:56 ` Maxim Levitsky
2019-10-15 14:27 ` [PATCH v2 06/21] iotests: Drop compat=1.1 in 050 Max Reitz
2019-10-15 14:27 ` [PATCH v2 07/21] iotests: Let _make_test_img parse its parameters Max Reitz
2019-10-15 14:27 ` [PATCH v2 08/21] iotests: Add -o and --no-opts to _make_test_img Max Reitz
2019-10-15 14:27 ` [PATCH v2 09/21] iotests: Inject space into -ocompat=0.10 in 051 Max Reitz
2019-10-15 14:27 ` [PATCH v2 10/21] iotests: Replace IMGOPTS= by -o Max Reitz
2019-11-06 15:47 ` Maxim Levitsky
2019-11-07 9:20 ` Max Reitz
2019-11-07 9:52 ` Maxim Levitsky
2019-10-15 14:27 ` [PATCH v2 11/21] iotests: Replace IMGOPTS='' by --no-opts Max Reitz
2019-10-15 14:27 ` [PATCH v2 12/21] iotests: Drop IMGOPTS use in 267 Max Reitz
2019-11-06 15:50 ` Maxim Levitsky
2019-10-15 14:27 ` [PATCH v2 13/21] iotests: Avoid qemu-img create Max Reitz
2019-10-15 14:27 ` [PATCH v2 14/21] iotests: Use _rm_test_img for deleting test images Max Reitz
2019-11-06 15:47 ` Maxim Levitsky
2019-10-15 14:27 ` [PATCH v2 15/21] iotests: Avoid cp/mv of " Max Reitz
2019-10-15 14:27 ` [PATCH v2 16/21] iotests: Make 091 work with data_file Max Reitz
2019-11-06 15:50 ` Maxim Levitsky
2019-10-15 14:27 ` [PATCH v2 17/21] iotests: Make 110 " Max Reitz
2019-11-06 15:50 ` Maxim Levitsky
2019-10-15 14:27 ` [PATCH v2 18/21] iotests: Make 137 " Max Reitz
2019-11-06 15:51 ` Maxim Levitsky
2019-10-15 14:27 ` [PATCH v2 19/21] iotests: Make 198 " Max Reitz
2019-11-06 15:51 ` Maxim Levitsky
2019-10-15 14:27 ` [PATCH v2 20/21] iotests: Disable data_file where it cannot be used Max Reitz
2019-11-06 15:52 ` Maxim Levitsky
2019-11-07 11:36 ` Max Reitz
2019-11-07 15:19 ` Maxim Levitsky
2019-11-07 16:55 ` Max Reitz
2019-10-15 14:27 ` [PATCH v2 21/21] iotests: Allow check -o data_file Max Reitz
2019-11-06 15:52 ` Maxim Levitsky
2019-10-16 0:19 ` [PATCH v2 00/21] iotests: Allow ./check " no-reply
2019-10-16 7:18 ` Max Reitz
2019-11-06 15:52 ` Maxim Levitsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a7a253f60f3286e9826d83c61ab540a76b356f20.camel@redhat.com \
--to=mlevitsk@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.