jcs.org
qemu with hax to log dma reads & writes
jcs.org/2018/11/12/vfio
iotests: filter few more luks specific create options
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 <mlevitsk@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-Id: <20200625125548.870061-3-mreitz@redhat.com>
authored by
Maxim Levitsky
and committed by
Max Reitz
cbb32e79
57ee95ed
+17
-20
+3
-3
tests/qemu-iotests/087.out
+3
-3
tests/qemu-iotests/087.out
···
34
34
35
35
=== Encrypted image QCow ===
36
36
37
-
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 encryption=on encrypt.key-secret=sec0
37
+
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 encryption=on
38
38
Testing:
39
39
QMP_VERSION
40
40
{"return": {}}
···
46
46
47
47
=== Encrypted image LUKS ===
48
48
49
-
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 encrypt.format=luks encrypt.key-secret=sec0
49
+
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
50
50
Testing:
51
51
QMP_VERSION
52
52
{"return": {}}
···
58
58
59
59
=== Missing driver ===
60
60
61
-
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 encryption=on encrypt.key-secret=sec0
61
+
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 encryption=on
62
62
Testing: -S
63
63
QMP_VERSION
64
64
{"return": {}}
+1
-1
tests/qemu-iotests/134.out
+1
-1
tests/qemu-iotests/134.out
+2
-2
tests/qemu-iotests/158.out
+2
-2
tests/qemu-iotests/158.out
···
1
1
QA output created by 158
2
2
== create base ==
3
-
Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=134217728 encryption=on encrypt.key-secret=sec0
3
+
Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=134217728 encryption=on
4
4
5
5
== writing whole image ==
6
6
wrote 134217728/134217728 bytes at offset 0
···
10
10
read 134217728/134217728 bytes at offset 0
11
11
128 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
12
12
== create overlay ==
13
-
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/t.IMGFMT.base encryption=on encrypt.key-secret=sec0
13
+
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/t.IMGFMT.base encryption=on
14
14
15
15
== writing part of a cluster ==
16
16
wrote 1024/1024 bytes at offset 0
+1
-1
tests/qemu-iotests/188.out
+1
-1
tests/qemu-iotests/188.out
+2
-2
tests/qemu-iotests/189.out
+2
-2
tests/qemu-iotests/189.out
···
1
1
QA output created by 189
2
2
== create base ==
3
-
Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=16777216 encrypt.format=luks encrypt.key-secret=sec0 encrypt.iter-time=10
3
+
Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=16777216
4
4
5
5
== writing whole image ==
6
6
wrote 16777216/16777216 bytes at offset 0
···
10
10
read 16777216/16777216 bytes at offset 0
11
11
16 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
12
12
== create overlay ==
13
-
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=16777216 backing_file=TEST_DIR/t.IMGFMT.base encrypt.format=luks encrypt.key-secret=sec1 encrypt.iter-time=10
13
+
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=16777216 backing_file=TEST_DIR/t.IMGFMT.base
14
14
15
15
== writing part of a cluster ==
16
16
wrote 1024/1024 bytes at offset 0
+2
-2
tests/qemu-iotests/198.out
+2
-2
tests/qemu-iotests/198.out
···
1
1
QA output created by 198
2
2
== create base ==
3
-
Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=16777216 encrypt.format=luks encrypt.key-secret=sec0 encrypt.iter-time=10
3
+
Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=16777216
4
4
5
5
== writing whole image base ==
6
6
wrote 16777216/16777216 bytes at offset 0
7
7
16 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
8
8
== create overlay ==
9
-
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=16777216 backing_file=TEST_DIR/t.IMGFMT.base encrypt.format=luks encrypt.key-secret=sec1 encrypt.iter-time=10
9
+
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=16777216 backing_file=TEST_DIR/t.IMGFMT.base
10
10
11
11
== writing whole image layer ==
12
12
wrote 16777216/16777216 bytes at offset 0
+2
-2
tests/qemu-iotests/263.out
+2
-2
tests/qemu-iotests/263.out
···
2
2
3
3
testing LUKS qcow2 encryption
4
4
5
-
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 encrypt.format=luks encrypt.key-secret=sec0 encrypt.iter-time=10
5
+
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
6
6
== reading the whole image ==
7
7
read 1048576/1048576 bytes at offset 0
8
8
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
···
21
21
22
22
testing legacy AES qcow2 encryption
23
23
24
-
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 encrypt.format=aes encrypt.key-secret=sec0
24
+
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
25
25
== reading the whole image ==
26
26
read 1048576/1048576 bytes at offset 0
27
27
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+3
-3
tests/qemu-iotests/284.out
+3
-3
tests/qemu-iotests/284.out
···
2
2
3
3
testing LUKS qcow2 encryption
4
4
5
-
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 encrypt.format=luks encrypt.key-secret=sec0 encrypt.iter-time=10
5
+
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
6
6
7
7
== cluster size 512
8
8
== checking image refcounts ==
···
21
21
22
22
== rechecking image refcounts ==
23
23
No errors were found on the image.
24
-
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 encrypt.format=luks encrypt.key-secret=sec0 encrypt.iter-time=10
24
+
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
25
25
26
26
== cluster size 2048
27
27
== checking image refcounts ==
···
40
40
41
41
== rechecking image refcounts ==
42
42
No errors were found on the image.
43
-
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 encrypt.format=luks encrypt.key-secret=sec0 encrypt.iter-time=10
43
+
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
44
44
45
45
== cluster size 32768
46
46
== checking image refcounts ==
+1
-4
tests/qemu-iotests/common.filter
+1
-4
tests/qemu-iotests/common.filter
···
178
178
| tr '\n' '\0' \
179
179
| $SED -e 's/ \([a-z0-9_.-]*\)=/\n\1=/g' \
180
180
| grep -a -e '^fmt' -e '^size' -e '^backing' -e '^preallocation' \
181
-
-e '^encrypt' "${grep_data_file[@]}" \
181
+
-e '^encryption' "${grep_data_file[@]}" \
182
182
| $SED "${filename_filters[@]}" \
183
183
-e 's/^\(fmt\)/0-\1/' \
184
184
-e 's/^\(size\)/1-\1/' \
185
185
-e 's/^\(backing\)/2-\1/' \
186
186
-e 's/^\(data_file\)/3-\1/' \
187
187
-e 's/^\(encryption\)/4-\1/' \
188
-
-e 's/^\(encrypt\.format\)/5-\1/' \
189
-
-e 's/^\(encrypt\.key-secret\)/6-\1/' \
190
-
-e 's/^\(encrypt\.iter-time\)/7-\1/' \
191
188
-e 's/^\(preallocation\)/8-\1/' \
192
189
| sort \
193
190
| $SED -e 's/^[0-9]-//' \