From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Maxim Levitsky <mlevitsk@redhat.com>,
qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [PATCH v3 05/22] iotests: Filter refcount_order in 036
Date: Thu, 7 Nov 2019 17:36:51 +0100 [thread overview]
Message-ID: <20191107163708.833192-6-mreitz@redhat.com> (raw)
In-Reply-To: <20191107163708.833192-1-mreitz@redhat.com>
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>
Reviewed-by: Maxim Levitsky <mlevitsk@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
--
2.23.0
next prev parent reply other threads:[~2019-11-07 16:41 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-07 16:36 [PATCH v3 00/22] iotests: Allow ./check -o data_file Max Reitz
2019-11-07 16:36 ` [PATCH v3 01/22] iotests: s/qocw2/qcow2/ Max Reitz
2019-11-07 18:02 ` Eric Blake
2019-11-08 15:39 ` Maxim Levitsky
2019-11-07 16:36 ` [PATCH v3 02/22] iotests/qcow2.py: Add dump-header-exts Max Reitz
2019-11-07 16:36 ` [PATCH v3 03/22] iotests/qcow2.py: Split feature fields into bits Max Reitz
2019-11-07 16:36 ` [PATCH v3 04/22] iotests: Add _filter_json_filename Max Reitz
2019-11-07 16:36 ` Max Reitz [this message]
2019-11-07 16:36 ` [PATCH v3 06/22] iotests: Replace IMGOPTS by _unsupported_imgopts Max Reitz
2019-11-07 16:36 ` [PATCH v3 07/22] iotests: Drop compat=1.1 in 050 Max Reitz
2019-11-07 16:36 ` [PATCH v3 08/22] iotests: Let _make_test_img parse its parameters Max Reitz
2019-11-07 16:36 ` [PATCH v3 09/22] iotests: Add -o and --no-opts to _make_test_img Max Reitz
2019-11-07 16:36 ` [PATCH v3 10/22] iotests: Inject space into -ocompat=0.10 in 051 Max Reitz
2019-11-07 16:36 ` [PATCH v3 11/22] iotests: Replace IMGOPTS= by -o Max Reitz
2019-11-07 16:36 ` [PATCH v3 12/22] iotests: Replace IMGOPTS='' by --no-opts Max Reitz
2019-11-07 16:36 ` [PATCH v3 13/22] iotests: Drop IMGOPTS use in 267 Max Reitz
2019-11-07 16:37 ` [PATCH v3 14/22] iotests: Avoid qemu-img create Max Reitz
2019-11-07 16:37 ` [PATCH v3 15/22] iotests: Use _rm_test_img for deleting test images Max Reitz
2019-11-07 16:37 ` [PATCH v3 16/22] iotests: Avoid cp/mv of " Max Reitz
2019-11-07 16:37 ` [PATCH v3 17/22] iotests: Make 091 work with data_file Max Reitz
2019-11-07 16:37 ` [PATCH v3 18/22] iotests: Make 110 " Max Reitz
2019-11-07 16:37 ` [PATCH v3 19/22] iotests: Make 137 " Max Reitz
2019-11-07 16:37 ` [PATCH v3 20/22] iotests: Make 198 " Max Reitz
2019-11-07 16:37 ` [PATCH v3 21/22] iotests: Disable data_file where it cannot be used Max Reitz
2019-11-07 16:45 ` Max Reitz
2019-11-07 16:37 ` [PATCH v3 22/22] iotests: Allow check -o data_file Max Reitz
2019-11-07 21:10 ` [PATCH v3 00/22] iotests: Allow ./check " no-reply
2019-11-08 9:57 ` Max Reitz
2019-12-17 14:32 ` Max Reitz
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=20191107163708.833192-6-mreitz@redhat.com \
--to=mreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=mlevitsk@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.