jcs.org
qemu with hax to log dma reads & writes
jcs.org/2018/11/12/vfio
Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2020-06-24' into staging
Block patches:
- Two iotest fixes
# gpg: Signature made Wed 24 Jun 2020 09:00:51 BST
# gpg: using RSA key 91BEB60A30DB3E8857D11829F407DB0061D5CF40
# gpg: issuer "mreitz@redhat.com"
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>" [full]
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1 1829 F407 DB00 61D5 CF40
* remotes/maxreitz/tags/pull-block-2020-06-24:
iotests: don't test qcow2.py inside 291
iotests: Fix 051 output after qdev_init_nofail() removal
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
+2
-39
+2
-2
tests/qemu-iotests/051.pc.out
+2
-2
tests/qemu-iotests/051.pc.out
···
142
142
143
143
Testing: -drive if=ide
144
144
QEMU X.Y.Z monitor - type 'help' for more information
145
-
(qemu) QEMU_PROG: Initialization of device ide-hd failed: Device needs media, but drive is empty
145
+
(qemu) QEMU_PROG: Device needs media, but drive is empty
146
146
147
147
Testing: -drive if=virtio
148
148
QEMU X.Y.Z monitor - type 'help' for more information
···
214
214
215
215
Testing: -drive file=TEST_DIR/t.qcow2,if=ide,readonly=on
216
216
QEMU X.Y.Z monitor - type 'help' for more information
217
-
(qemu) QEMU_PROG: Initialization of device ide-hd failed: Block node is read-only
217
+
(qemu) QEMU_PROG: Block node is read-only
218
218
219
219
Testing: -drive file=TEST_DIR/t.qcow2,if=virtio,readonly=on
220
220
QEMU X.Y.Z monitor - type 'help' for more information
-4
tests/qemu-iotests/291
-4
tests/qemu-iotests/291
···
64
64
$QEMU_IMG bitmap --disable -f $IMGFMT "$TEST_IMG" b1
65
65
$QEMU_IMG bitmap --enable -f $IMGFMT "$TEST_IMG" b2
66
66
$QEMU_IO -c 'w 2M 1M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io
67
-
echo "Check resulting qcow2 header extensions:"
68
-
$PYTHON qcow2.py "$TEST_IMG" dump-header-exts
69
67
70
68
echo
71
69
echo "=== Bitmap preservation not possible to non-qcow2 ==="
···
92
90
$QEMU_IMG bitmap --remove --image-opts \
93
91
driver=$IMGFMT,file.driver=file,file.filename="$TEST_IMG" tmp
94
92
_img_info --format-specific
95
-
echo "Check resulting qcow2 header extensions:"
96
-
$PYTHON qcow2.py "$TEST_IMG" dump-header-exts
97
93
98
94
echo
99
95
echo "=== Check bitmap contents ==="
-33
tests/qemu-iotests/291.out
-33
tests/qemu-iotests/291.out
···
14
14
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
15
15
wrote 1048576/1048576 bytes at offset 2097152
16
16
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
17
-
Check resulting qcow2 header extensions:
18
-
Header extension:
19
-
magic 0xe2792aca (Backing format)
20
-
length 5
21
-
data 'qcow2'
22
-
23
-
Header extension:
24
-
magic 0x6803f857 (Feature table)
25
-
length 336
26
-
data <binary>
27
-
28
-
Header extension:
29
-
magic 0x23852875 (Bitmaps)
30
-
length 24
31
-
nb_bitmaps 2
32
-
reserved32 0
33
-
bitmap_directory_size 0x40
34
-
bitmap_directory_offset 0x510000
35
-
36
17
37
18
=== Bitmap preservation not possible to non-qcow2 ===
38
19
···
84
65
granularity: 65536
85
66
refcount bits: 16
86
67
corrupt: false
87
-
Check resulting qcow2 header extensions:
88
-
Header extension:
89
-
magic 0x6803f857 (Feature table)
90
-
length 336
91
-
data <binary>
92
-
93
-
Header extension:
94
-
magic 0x23852875 (Bitmaps)
95
-
length 24
96
-
nb_bitmaps 3
97
-
reserved32 0
98
-
bitmap_directory_size 0x60
99
-
bitmap_directory_offset 0x520000
100
-
101
68
102
69
=== Check bitmap contents ===
103
70