[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 26/29] iotests: Filter compat-dependent info in 198
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 26/29] iotests: Filter compat-dependent info in 198 |
Date: |
Tue, 23 Jan 2018 15:01:58 +0100 |
From: Max Reitz <address@hidden>
There is a bit of image-specific information which depends on the qcow2
compat level. Filter it so that 198 works with compat=0.10 (and any
refcount_bits value).
Note that we cannot simply drop the --format-specific switch because we
do need the "encrypt" information.
Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: John Snow <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/198 | 6 ++++--
tests/qemu-iotests/198.out | 8 --------
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/tests/qemu-iotests/198 b/tests/qemu-iotests/198
index a84a058396..54eaaf5153 100755
--- a/tests/qemu-iotests/198
+++ b/tests/qemu-iotests/198
@@ -92,12 +92,14 @@ $QEMU_IO --object $SECRET0 --object $SECRET1 -c "read -P
0x9 0 $size" --image-op
echo
echo "== checking image base =="
$QEMU_IMG info --image-opts $IMGSPECBASE | _filter_img_info --format-specific \
- | sed -e "/^disk size:/ D"
+ | sed -e "/^disk size:/ D" -e '/refcount bits:/ D' -e '/compat:/ D' \
+ -e '/lazy refcounts:/ D' -e '/corrupt:/ D'
echo
echo "== checking image layer =="
$QEMU_IMG info --image-opts $IMGSPECLAYER | _filter_img_info --format-specific
\
- | sed -e "/^disk size:/ D"
+ | sed -e "/^disk size:/ D" -e '/refcount bits:/ D' -e '/compat:/ D' \
+ -e '/lazy refcounts:/ D' -e '/corrupt:/ D'
# success, all done
diff --git a/tests/qemu-iotests/198.out b/tests/qemu-iotests/198.out
index 2db565e16b..adb805cce9 100644
--- a/tests/qemu-iotests/198.out
+++ b/tests/qemu-iotests/198.out
@@ -36,9 +36,6 @@ image: json:{"encrypt.key-secret": "sec0", "driver":
"IMGFMT", "file": {"driver"
file format: IMGFMT
virtual size: 16M (16777216 bytes)
Format specific information:
- compat: 1.1
- lazy refcounts: false
- refcount bits: 16
encrypt:
ivgen alg: plain64
hash alg: sha256
@@ -75,7 +72,6 @@ Format specific information:
key offset: 1810432
payload offset: 2068480
master key iters: 1024
- corrupt: false
== checking image layer ==
image: json:{"encrypt.key-secret": "sec1", "driver": "IMGFMT", "file":
{"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}}
@@ -83,9 +79,6 @@ file format: IMGFMT
virtual size: 16M (16777216 bytes)
backing file: TEST_DIR/t.IMGFMT.base
Format specific information:
- compat: 1.1
- lazy refcounts: false
- refcount bits: 16
encrypt:
ivgen alg: plain64
hash alg: sha256
@@ -122,5 +115,4 @@ Format specific information:
key offset: 1810432
payload offset: 2068480
master key iters: 1024
- corrupt: false
*** done
--
2.13.6
- [Qemu-devel] [PULL 14/29] block/vmdk: Add blkdebug events, (continued)
- [Qemu-devel] [PULL 14/29] block/vmdk: Add blkdebug events, Kevin Wolf, 2018/01/23
- [Qemu-devel] [PULL 15/29] iotests: Fix _img_info for backslashes, Kevin Wolf, 2018/01/23
- [Qemu-devel] [PULL 09/29] blockdev: Mark BD-{remove, insert}-medium stable, Kevin Wolf, 2018/01/23
- [Qemu-devel] [PULL 20/29] iotests: Fix 051 for compat=0.10, Kevin Wolf, 2018/01/23
- [Qemu-devel] [PULL 12/29] qcow2: No persistent dirty bitmaps for compat=0.10, Kevin Wolf, 2018/01/23
- [Qemu-devel] [PULL 19/29] iotests: Fix 020 for vmdk, Kevin Wolf, 2018/01/23
- [Qemu-devel] [PULL 21/29] iotests: Fix 059's reference output, Kevin Wolf, 2018/01/23
- [Qemu-devel] [PULL 24/29] iotests: Make 184 image-less, Kevin Wolf, 2018/01/23
- [Qemu-devel] [PULL 18/29] iotests: Skip 103 for refcount_bits=1, Kevin Wolf, 2018/01/23
- [Qemu-devel] [PULL 17/29] iotests: Forbid 020 for non-file protocols, Kevin Wolf, 2018/01/23
- [Qemu-devel] [PULL 26/29] iotests: Filter compat-dependent info in 198,
Kevin Wolf <=
- [Qemu-devel] [PULL 23/29] iotests: Make 089 compatible with compat=0.10, Kevin Wolf, 2018/01/23
- [Qemu-devel] [PULL 22/29] iotests: Fix 067 for compat=0.10, Kevin Wolf, 2018/01/23
- [Qemu-devel] [PULL 29/29] iotests: Disable some tests for compat=0.10, Kevin Wolf, 2018/01/23
- [Qemu-devel] [PULL 27/29] iotests: Make 059 pass on machines with little RAM, Kevin Wolf, 2018/01/23
- [Qemu-devel] [PULL 25/29] iotests: Make 191 work with qcow2 options, Kevin Wolf, 2018/01/23
- [Qemu-devel] [PULL 28/29] iotests: Split 177 into two parts for compat=0.10, Kevin Wolf, 2018/01/23
- Re: [Qemu-devel] [PULL 00/29] Block layer patches, Peter Maydell, 2018/01/25