1
The following changes since commit 22d96eac64877c4d96f9928babb6f2fcc68faacf:
1
The following changes since commit 16aaacb307ed607b9780c12702c44f0fe52edc7e:
2
2
3
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging (2019-04-29 19:11:15 +0100)
3
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20200430' into staging (2020-04-30 14:00:36 +0100)
4
4
5
are available in the Git repository at:
5
are available in the Git repository at:
6
6
7
git://repo.or.cz/qemu/kevin.git tags/for-upstream
7
git://repo.or.cz/qemu/kevin.git tags/for-upstream
8
8
9
for you to fetch changes up to 54277a2aab876aba7b55c7e88e2b372691849741:
9
for you to fetch changes up to eaae29ef89d498d0eac553c77b554f310a47f809:
10
10
11
block/qed: add missed coroutine_fn markers (2019-04-30 15:29:00 +0200)
11
qemu-storage-daemon: Fix non-string --object properties (2020-04-30 17:51:07 +0200)
12
12
13
----------------------------------------------------------------
13
----------------------------------------------------------------
14
Block layer patches:
14
Block layer patches:
15
15
16
- iotests: Fix output of qemu-io related tests
16
- Fix resize (extending) of short overlays
17
- Don't ignore bdrv_set_aio_context() for nodes with bs->drv = NUL
17
- nvme: introduce PMR support from NVMe 1.4 spec
18
- vmdk: Set vmdk parent backing_format to vmdk
18
- qemu-storage-daemon: Fix non-string --object properties
19
- qcow2: Preallocation fixes (especially for external data files)
20
- Add linear-buffer-based APIs (as wrappers around qiov-based ones)
21
- Various code cleanups and small corner case fixes
22
19
23
----------------------------------------------------------------
20
----------------------------------------------------------------
24
Alberto Garcia (3):
21
Alberto Garcia (1):
25
qcow2: Fix error handling in the compression code
22
qcow2: Add incompatibility note between backing files and raw external data files
26
commit: Make base read-only if there is an early failure
27
iotests: Check that images are in read-only mode after block-commit
28
23
29
Eric Blake (2):
24
Andrzej Jakowski (1):
30
cutils: Fix size_to_str() on 32-bit platforms
25
nvme: introduce PMR support from NVMe 1.4 spec
31
qemu-img: Saner printing of large file sizes
32
26
33
Kevin Wolf (5):
27
Kevin Wolf (12):
34
block: Fix AioContext switch for bs->drv == NULL
28
block: Add flags to BlockDriver.bdrv_co_truncate()
35
qcow2: Avoid COW during metadata preallocation
29
block: Add flags to bdrv(_co)_truncate()
36
qcow2: Add errp to preallocate_co()
30
block-backend: Add flags to blk_truncate()
37
qcow2: Fix full preallocation with external data file
31
qcow2: Support BDRV_REQ_ZERO_WRITE for truncate
38
qcow2: Fix qcow2_make_empty() with external data file
32
raw-format: Support BDRV_REQ_ZERO_WRITE for truncate
33
file-posix: Support BDRV_REQ_ZERO_WRITE for truncate
34
block: truncate: Don't make backing file data visible
35
iotests: Filter testfiles out in filter_img_info()
36
iotests: Test committing to short backing file
37
qcow2: Forward ZERO_WRITE flag for full preallocation
38
qom: Factor out user_creatable_add_dict()
39
qemu-storage-daemon: Fix non-string --object properties
39
40
40
Max Reitz (2):
41
Paolo Bonzini (1):
41
iotests: Perform the correct test in 082
42
qemu-iotests: allow qcow2 external discarded clusters to contain stale data
42
qemu-img: Make create hint at protocol options
43
43
44
Sam Eiderman (1):
44
docs/interop/qcow2.txt | 3 +
45
vmdk: Set vmdk parent backing_format to vmdk
45
hw/block/nvme.h | 2 +
46
include/block/block.h | 5 +-
47
include/block/block_int.h | 10 +-
48
include/block/nvme.h | 172 ++++++++++++++++++++++++++
49
include/qom/object_interfaces.h | 16 +++
50
include/sysemu/block-backend.h | 2 +-
51
block.c | 3 +-
52
block/block-backend.c | 4 +-
53
block/commit.c | 4 +-
54
block/crypto.c | 7 +-
55
block/file-posix.c | 6 +-
56
block/file-win32.c | 2 +-
57
block/gluster.c | 1 +
58
block/io.c | 43 ++++++-
59
block/iscsi.c | 2 +-
60
block/mirror.c | 2 +-
61
block/nfs.c | 3 +-
62
block/parallels.c | 6 +-
63
block/qcow.c | 4 +-
64
block/qcow2-cluster.c | 2 +-
65
block/qcow2-refcount.c | 2 +-
66
block/qcow2.c | 73 +++++++++--
67
block/qed.c | 3 +-
68
block/raw-format.c | 6 +-
69
block/rbd.c | 1 +
70
block/sheepdog.c | 4 +-
71
block/ssh.c | 2 +-
72
block/vdi.c | 2 +-
73
block/vhdx-log.c | 2 +-
74
block/vhdx.c | 6 +-
75
block/vmdk.c | 8 +-
76
block/vpc.c | 2 +-
77
blockdev.c | 2 +-
78
hw/block/nvme.c | 109 ++++++++++++++++
79
qemu-img.c | 2 +-
80
qemu-io-cmds.c | 2 +-
81
qemu-storage-daemon.c | 4 +-
82
qom/object_interfaces.c | 31 +++++
83
qom/qom-qmp-cmds.c | 24 +---
84
tests/test-block-iothread.c | 9 +-
85
tests/qemu-iotests/iotests.py | 5 +-
86
hw/block/Makefile.objs | 2 +-
87
hw/block/trace-events | 4 +
88
tests/qemu-iotests/244 | 10 +-
89
tests/qemu-iotests/244.out | 9 +-
90
tests/qemu-iotests/274 | 155 +++++++++++++++++++++++
91
tests/qemu-iotests/274.out | 268 ++++++++++++++++++++++++++++++++++++++++
92
tests/qemu-iotests/group | 1 +
93
49 files changed, 951 insertions(+), 96 deletions(-)
94
create mode 100755 tests/qemu-iotests/274
95
create mode 100644 tests/qemu-iotests/274.out
46
96
47
Stefano Garzarella (2):
48
block/vhdx: Remove redundant IEC binary prefixes definition
49
block/vhdx: Use IEC binary prefixes for size constants
50
97
51
Thomas Huth (1):
52
tests/qemu-iotests: Fix output of qemu-io related tests
53
54
Vladimir Sementsov-Ogievskiy (10):
55
block: introduce byte-based io helpers
56
block/qcow2: use buffer-based io
57
block/qcow: use buffer-based io
58
block/qed: use buffer-based io
59
block/parallels: use buffer-based io
60
block/backup: use buffer-based io
61
block/commit: use buffer-based io
62
block/stream: use buffer-based io
63
qemu-img: use buffer-based io
64
block/qed: add missed coroutine_fn markers
65
66
Zhengui li (1):
67
vpc: unlock Coroutine lock to make IO submit Concurrently
68
69
block/qed.h | 28 ++++---
70
block/vhdx.h | 16 ++--
71
include/block/block_int.h | 16 ++++
72
include/sysemu/block-backend.h | 19 +++++
73
block.c | 12 +--
74
block/backup.c | 14 ++--
75
block/commit.c | 8 +-
76
block/parallels.c | 14 ++--
77
block/qapi.c | 49 +++---------
78
block/qcow.c | 19 ++---
79
block/qcow2.c | 80 ++++++++++----------
80
block/qed-check.c | 4 +-
81
block/qed-table.c | 45 ++++++-----
82
block/qed.c | 11 ++-
83
block/stream.c | 4 +-
84
block/vhdx-log.c | 2 +-
85
block/vhdx.c | 7 +-
86
block/vmdk.c | 2 +
87
block/vpc.c | 4 +
88
qemu-img.c | 26 ++++---
89
util/cutils.c | 2 +-
90
tests/qemu-iotests/026.out | 168 ++++++++++++++++++++---------------------
91
tests/qemu-iotests/043.out | 6 +-
92
tests/qemu-iotests/053.out | 2 +-
93
tests/qemu-iotests/059.out | 10 +--
94
tests/qemu-iotests/060.out | 16 ++--
95
tests/qemu-iotests/061.out | 12 +--
96
tests/qemu-iotests/069.out | 2 +-
97
tests/qemu-iotests/070.out | 4 +-
98
tests/qemu-iotests/075.out | 14 ++--
99
tests/qemu-iotests/076.out | 6 +-
100
tests/qemu-iotests/078.out | 12 +--
101
tests/qemu-iotests/080.out | 40 +++++-----
102
tests/qemu-iotests/081.out | 2 +-
103
tests/qemu-iotests/082 | 5 +-
104
tests/qemu-iotests/082.out | 51 ++++++++-----
105
tests/qemu-iotests/084.out | 8 +-
106
tests/qemu-iotests/088.out | 12 +--
107
tests/qemu-iotests/089.out | 2 +-
108
tests/qemu-iotests/095.out | 4 +-
109
tests/qemu-iotests/103.out | 14 ++--
110
tests/qemu-iotests/104.out | 6 +-
111
tests/qemu-iotests/110.out | 6 +-
112
tests/qemu-iotests/114.out | 4 +-
113
tests/qemu-iotests/116.out | 14 ++--
114
tests/qemu-iotests/126.out | 4 +-
115
tests/qemu-iotests/130.out | 10 +--
116
tests/qemu-iotests/131.out | 2 +-
117
tests/qemu-iotests/133.out | 30 ++++----
118
tests/qemu-iotests/137.out | 28 +++----
119
tests/qemu-iotests/140.out | 2 +-
120
tests/qemu-iotests/143.out | 2 +-
121
tests/qemu-iotests/153.out | 32 ++++----
122
tests/qemu-iotests/187.out | 6 +-
123
tests/qemu-iotests/188.out | 2 +-
124
tests/qemu-iotests/191.out | 8 +-
125
tests/qemu-iotests/195.out | 4 +-
126
tests/qemu-iotests/197.out | 2 +-
127
tests/qemu-iotests/198.out | 4 +-
128
tests/qemu-iotests/205 | 2 +-
129
tests/qemu-iotests/206.out | 10 +--
130
tests/qemu-iotests/207.out | 12 +--
131
tests/qemu-iotests/210.out | 8 +-
132
tests/qemu-iotests/211.out | 10 +--
133
tests/qemu-iotests/212.out | 10 +--
134
tests/qemu-iotests/213.out | 10 +--
135
tests/qemu-iotests/215.out | 2 +-
136
tests/qemu-iotests/226.out | 16 ++--
137
tests/qemu-iotests/233.out | 4 +-
138
tests/qemu-iotests/237.out | 22 +++---
139
tests/qemu-iotests/242.out | 10 +--
140
tests/qemu-iotests/244.out | 10 +--
141
tests/qemu-iotests/249 | 115 ++++++++++++++++++++++++++++
142
tests/qemu-iotests/249.out | 35 +++++++++
143
tests/qemu-iotests/group | 1 +
144
75 files changed, 696 insertions(+), 519 deletions(-)
145
create mode 100755 tests/qemu-iotests/249
146
create mode 100644 tests/qemu-iotests/249.out
147
diff view generated by jsdifflib
1
From: Alberto Garcia <berto@igalia.com>
1
From: Alberto Garcia <berto@igalia.com>
2
2
3
You can reproduce this by passing an invalid filter-node-name (like
3
Backing files and raw external data files are mutually exclusive.
4
"1234") to block-commit. In this case the base image is put in
4
The documentation of the raw external data bit (in autoclear_features)
5
read-write mode but is never reset back to read-only.
5
already indicates that, but we should also mention it on the other
6
side.
6
7
8
Suggested-by: Eric Blake <eblake@redhat.com>
7
Signed-off-by: Alberto Garcia <berto@igalia.com>
9
Signed-off-by: Alberto Garcia <berto@igalia.com>
8
Reviewed-by: Max Reitz <mreitz@redhat.com>
10
Message-Id: <20200410121816.8334-1-berto@igalia.com>
11
Reviewed-by: Eric Blake <eblake@redhat.com>
9
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
12
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
10
---
13
---
11
block/commit.c | 3 +++
14
docs/interop/qcow2.txt | 3 +++
12
1 file changed, 3 insertions(+)
15
1 file changed, 3 insertions(+)
13
16
14
diff --git a/block/commit.c b/block/commit.c
17
diff --git a/docs/interop/qcow2.txt b/docs/interop/qcow2.txt
15
index XXXXXXX..XXXXXXX 100644
18
index XXXXXXX..XXXXXXX 100644
16
--- a/block/commit.c
19
--- a/docs/interop/qcow2.txt
17
+++ b/block/commit.c
20
+++ b/docs/interop/qcow2.txt
18
@@ -XXX,XX +XXX,XX @@ fail:
21
@@ -XXX,XX +XXX,XX @@ The first cluster of a qcow2 image contains the file header:
19
if (s->top) {
22
is stored (NB: The string is not null terminated). 0 if the
20
blk_unref(s->top);
23
image doesn't have a backing file.
21
}
24
22
+ if (s->base_read_only) {
25
+ Note: backing files are incompatible with raw external data
23
+ bdrv_reopen_set_read_only(base, true, NULL);
26
+ files (auto-clear feature bit 1).
24
+ }
27
+
25
job_early_fail(&s->common.job);
28
16 - 19: backing_file_size
26
/* commit_top_bs has to be replaced after deleting the block job,
29
Length of the backing file name in bytes. Must not be
27
* otherwise this would fail because of lack of permissions. */
30
longer than 1023 bytes. Undefined if the image doesn't have
28
--
31
--
29
2.20.1
32
2.25.3
30
33
31
34
diff view generated by jsdifflib
1
From: Thomas Huth <thuth@redhat.com>
1
From: Paolo Bonzini <pbonzini@redhat.com>
2
2
3
One of the recent commits changed the way qemu-io prints out its
3
Test 244 checks the expected behavior of qcow2 external data files
4
errors and warnings - they are now prefixed with the program name.
4
with respect to zero and discarded clusters. Filesystems however
5
We've got to adapt the iotests accordingly to prevent that they
5
are free to ignore discard requests, and this seems to be the
6
are failing.
6
case for overlayfs. Relax the tests to skip checks on the
7
external data file for discarded areas, which implies not using
8
qemu-img compare in the data_file_raw=on case.
7
9
8
Fixes: 99e98d7c9fc1a1639fad ("qemu-io: Use error_[gs]et_progname()")
10
This fixes docker tests on RHEL8.
9
Signed-off-by: Thomas Huth <thuth@redhat.com>
11
12
Cc: Kevin Wolf <kwolf@redhat.com>
13
Cc: qemu-block@nongnu.org
14
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
15
Message-Id: <20200409191006.24429-1-pbonzini@redhat.com>
10
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
16
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
11
---
17
---
12
tests/qemu-iotests/026.out | 168 ++++++++++++++++++-------------------
18
tests/qemu-iotests/244 | 10 ++++++++--
13
tests/qemu-iotests/060.out | 6 +-
19
tests/qemu-iotests/244.out | 9 ++++++---
14
tests/qemu-iotests/069.out | 2 +-
20
2 files changed, 14 insertions(+), 5 deletions(-)
15
tests/qemu-iotests/070.out | 2 +-
16
tests/qemu-iotests/075.out | 14 ++--
17
tests/qemu-iotests/076.out | 6 +-
18
tests/qemu-iotests/078.out | 12 +--
19
tests/qemu-iotests/080.out | 40 ++++-----
20
tests/qemu-iotests/081.out | 2 +-
21
tests/qemu-iotests/088.out | 12 +--
22
tests/qemu-iotests/103.out | 14 ++--
23
tests/qemu-iotests/114.out | 2 +-
24
tests/qemu-iotests/116.out | 14 ++--
25
tests/qemu-iotests/131.out | 2 +-
26
tests/qemu-iotests/133.out | 30 +++----
27
tests/qemu-iotests/137.out | 28 +++----
28
tests/qemu-iotests/140.out | 2 +-
29
tests/qemu-iotests/143.out | 2 +-
30
tests/qemu-iotests/153.out | 30 +++----
31
tests/qemu-iotests/187.out | 6 +-
32
tests/qemu-iotests/188.out | 2 +-
33
tests/qemu-iotests/197.out | 2 +-
34
tests/qemu-iotests/205 | 2 +-
35
tests/qemu-iotests/215.out | 2 +-
36
tests/qemu-iotests/226.out | 16 ++--
37
tests/qemu-iotests/244.out | 10 +--
38
26 files changed, 214 insertions(+), 214 deletions(-)
39
21
40
diff --git a/tests/qemu-iotests/026.out b/tests/qemu-iotests/026.out
22
diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244
41
index XXXXXXX..XXXXXXX 100644
42
--- a/tests/qemu-iotests/026.out
43
+++ b/tests/qemu-iotests/026.out
44
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
45
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
46
47
Event: l1_update; errno: 5; imm: off; once: off; write
48
-Failed to flush the L2 table cache: Input/output error
49
-Failed to flush the refcount block cache: Input/output error
50
+qemu-io: Failed to flush the L2 table cache: Input/output error
51
+qemu-io: Failed to flush the refcount block cache: Input/output error
52
write failed: Input/output error
53
54
1 leaked clusters were found on the image.
55
@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
56
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
57
58
Event: l1_update; errno: 5; imm: off; once: off; write -b
59
-Failed to flush the L2 table cache: Input/output error
60
-Failed to flush the refcount block cache: Input/output error
61
+qemu-io: Failed to flush the L2 table cache: Input/output error
62
+qemu-io: Failed to flush the refcount block cache: Input/output error
63
write failed: Input/output error
64
65
1 leaked clusters were found on the image.
66
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
67
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
68
69
Event: l1_update; errno: 28; imm: off; once: off; write
70
-Failed to flush the L2 table cache: No space left on device
71
-Failed to flush the refcount block cache: No space left on device
72
+qemu-io: Failed to flush the L2 table cache: No space left on device
73
+qemu-io: Failed to flush the refcount block cache: No space left on device
74
write failed: No space left on device
75
76
1 leaked clusters were found on the image.
77
@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
78
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
79
80
Event: l1_update; errno: 28; imm: off; once: off; write -b
81
-Failed to flush the L2 table cache: No space left on device
82
-Failed to flush the refcount block cache: No space left on device
83
+qemu-io: Failed to flush the L2 table cache: No space left on device
84
+qemu-io: Failed to flush the refcount block cache: No space left on device
85
write failed: No space left on device
86
87
1 leaked clusters were found on the image.
88
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
89
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
90
91
Event: l2_update; errno: 5; imm: off; once: off; write
92
-Failed to flush the L2 table cache: Input/output error
93
-Failed to flush the refcount block cache: Input/output error
94
+qemu-io: Failed to flush the L2 table cache: Input/output error
95
+qemu-io: Failed to flush the refcount block cache: Input/output error
96
write failed: Input/output error
97
98
127 leaked clusters were found on the image.
99
@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
100
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
101
102
Event: l2_update; errno: 5; imm: off; once: off; write -b
103
-Failed to flush the L2 table cache: Input/output error
104
-Failed to flush the refcount block cache: Input/output error
105
+qemu-io: Failed to flush the L2 table cache: Input/output error
106
+qemu-io: Failed to flush the refcount block cache: Input/output error
107
write failed: Input/output error
108
109
127 leaked clusters were found on the image.
110
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
111
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
112
113
Event: l2_update; errno: 28; imm: off; once: off; write
114
-Failed to flush the L2 table cache: No space left on device
115
-Failed to flush the refcount block cache: No space left on device
116
+qemu-io: Failed to flush the L2 table cache: No space left on device
117
+qemu-io: Failed to flush the refcount block cache: No space left on device
118
write failed: No space left on device
119
120
127 leaked clusters were found on the image.
121
@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
122
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
123
124
Event: l2_update; errno: 28; imm: off; once: off; write -b
125
-Failed to flush the L2 table cache: No space left on device
126
-Failed to flush the refcount block cache: No space left on device
127
+qemu-io: Failed to flush the L2 table cache: No space left on device
128
+qemu-io: Failed to flush the refcount block cache: No space left on device
129
write failed: No space left on device
130
131
127 leaked clusters were found on the image.
132
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
133
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
134
135
Event: l2_alloc_write; errno: 5; imm: off; once: off; write
136
-Failed to flush the L2 table cache: Input/output error
137
-Failed to flush the refcount block cache: Input/output error
138
+qemu-io: Failed to flush the L2 table cache: Input/output error
139
+qemu-io: Failed to flush the refcount block cache: Input/output error
140
write failed: Input/output error
141
No errors were found on the image.
142
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
143
144
Event: l2_alloc_write; errno: 5; imm: off; once: off; write -b
145
-Failed to flush the L2 table cache: Input/output error
146
-Failed to flush the refcount block cache: Input/output error
147
+qemu-io: Failed to flush the L2 table cache: Input/output error
148
+qemu-io: Failed to flush the refcount block cache: Input/output error
149
write failed: Input/output error
150
151
1 leaked clusters were found on the image.
152
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
153
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
154
155
Event: l2_alloc_write; errno: 28; imm: off; once: off; write
156
-Failed to flush the L2 table cache: No space left on device
157
-Failed to flush the refcount block cache: No space left on device
158
+qemu-io: Failed to flush the L2 table cache: No space left on device
159
+qemu-io: Failed to flush the refcount block cache: No space left on device
160
write failed: No space left on device
161
No errors were found on the image.
162
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
163
164
Event: l2_alloc_write; errno: 28; imm: off; once: off; write -b
165
-Failed to flush the L2 table cache: No space left on device
166
-Failed to flush the refcount block cache: No space left on device
167
+qemu-io: Failed to flush the L2 table cache: No space left on device
168
+qemu-io: Failed to flush the refcount block cache: No space left on device
169
write failed: No space left on device
170
171
1 leaked clusters were found on the image.
172
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
173
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
174
175
Event: write_aio; errno: 5; imm: off; once: off; write
176
-Failed to flush the L2 table cache: Input/output error
177
-Failed to flush the refcount block cache: Input/output error
178
+qemu-io: Failed to flush the L2 table cache: Input/output error
179
+qemu-io: Failed to flush the refcount block cache: Input/output error
180
write failed: Input/output error
181
No errors were found on the image.
182
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
183
184
Event: write_aio; errno: 5; imm: off; once: off; write -b
185
-Failed to flush the L2 table cache: Input/output error
186
-Failed to flush the refcount block cache: Input/output error
187
+qemu-io: Failed to flush the L2 table cache: Input/output error
188
+qemu-io: Failed to flush the refcount block cache: Input/output error
189
write failed: Input/output error
190
No errors were found on the image.
191
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
192
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
193
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
194
195
Event: write_aio; errno: 28; imm: off; once: off; write
196
-Failed to flush the L2 table cache: No space left on device
197
-Failed to flush the refcount block cache: No space left on device
198
+qemu-io: Failed to flush the L2 table cache: No space left on device
199
+qemu-io: Failed to flush the refcount block cache: No space left on device
200
write failed: No space left on device
201
No errors were found on the image.
202
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
203
204
Event: write_aio; errno: 28; imm: off; once: off; write -b
205
-Failed to flush the L2 table cache: No space left on device
206
-Failed to flush the refcount block cache: No space left on device
207
+qemu-io: Failed to flush the L2 table cache: No space left on device
208
+qemu-io: Failed to flush the refcount block cache: No space left on device
209
write failed: No space left on device
210
No errors were found on the image.
211
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
212
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
213
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
214
215
Event: refblock_load; errno: 5; imm: off; once: off; write
216
-Failed to flush the L2 table cache: Input/output error
217
-Failed to flush the refcount block cache: Input/output error
218
+qemu-io: Failed to flush the L2 table cache: Input/output error
219
+qemu-io: Failed to flush the refcount block cache: Input/output error
220
write failed: Input/output error
221
No errors were found on the image.
222
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
223
224
Event: refblock_load; errno: 5; imm: off; once: off; write -b
225
-Failed to flush the L2 table cache: Input/output error
226
-Failed to flush the refcount block cache: Input/output error
227
+qemu-io: Failed to flush the L2 table cache: Input/output error
228
+qemu-io: Failed to flush the refcount block cache: Input/output error
229
write failed: Input/output error
230
No errors were found on the image.
231
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
232
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
233
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
234
235
Event: refblock_load; errno: 28; imm: off; once: off; write
236
-Failed to flush the L2 table cache: No space left on device
237
-Failed to flush the refcount block cache: No space left on device
238
+qemu-io: Failed to flush the L2 table cache: No space left on device
239
+qemu-io: Failed to flush the refcount block cache: No space left on device
240
write failed: No space left on device
241
No errors were found on the image.
242
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
243
244
Event: refblock_load; errno: 28; imm: off; once: off; write -b
245
-Failed to flush the L2 table cache: No space left on device
246
-Failed to flush the refcount block cache: No space left on device
247
+qemu-io: Failed to flush the L2 table cache: No space left on device
248
+qemu-io: Failed to flush the refcount block cache: No space left on device
249
write failed: No space left on device
250
No errors were found on the image.
251
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
252
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
253
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
254
255
Event: refblock_update_part; errno: 5; imm: off; once: off; write
256
-Failed to flush the L2 table cache: Input/output error
257
-Failed to flush the refcount block cache: Input/output error
258
+qemu-io: Failed to flush the L2 table cache: Input/output error
259
+qemu-io: Failed to flush the refcount block cache: Input/output error
260
write failed: Input/output error
261
No errors were found on the image.
262
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
263
264
Event: refblock_update_part; errno: 5; imm: off; once: off; write -b
265
-Failed to flush the L2 table cache: Input/output error
266
-Failed to flush the refcount block cache: Input/output error
267
+qemu-io: Failed to flush the L2 table cache: Input/output error
268
+qemu-io: Failed to flush the refcount block cache: Input/output error
269
write failed: Input/output error
270
No errors were found on the image.
271
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
272
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
273
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
274
275
Event: refblock_update_part; errno: 28; imm: off; once: off; write
276
-Failed to flush the L2 table cache: No space left on device
277
-Failed to flush the refcount block cache: No space left on device
278
+qemu-io: Failed to flush the L2 table cache: No space left on device
279
+qemu-io: Failed to flush the refcount block cache: No space left on device
280
write failed: No space left on device
281
No errors were found on the image.
282
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
283
284
Event: refblock_update_part; errno: 28; imm: off; once: off; write -b
285
-Failed to flush the L2 table cache: No space left on device
286
-Failed to flush the refcount block cache: No space left on device
287
+qemu-io: Failed to flush the L2 table cache: No space left on device
288
+qemu-io: Failed to flush the refcount block cache: No space left on device
289
write failed: No space left on device
290
No errors were found on the image.
291
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
292
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
293
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
294
295
Event: refblock_alloc; errno: 5; imm: off; once: off; write
296
-Failed to flush the L2 table cache: Input/output error
297
-Failed to flush the refcount block cache: Input/output error
298
+qemu-io: Failed to flush the L2 table cache: Input/output error
299
+qemu-io: Failed to flush the refcount block cache: Input/output error
300
write failed: Input/output error
301
No errors were found on the image.
302
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
303
304
Event: refblock_alloc; errno: 5; imm: off; once: off; write -b
305
-Failed to flush the L2 table cache: Input/output error
306
-Failed to flush the refcount block cache: Input/output error
307
+qemu-io: Failed to flush the L2 table cache: Input/output error
308
+qemu-io: Failed to flush the refcount block cache: Input/output error
309
write failed: Input/output error
310
No errors were found on the image.
311
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
312
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
313
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
314
315
Event: refblock_alloc; errno: 28; imm: off; once: off; write
316
-Failed to flush the L2 table cache: No space left on device
317
-Failed to flush the refcount block cache: No space left on device
318
+qemu-io: Failed to flush the L2 table cache: No space left on device
319
+qemu-io: Failed to flush the refcount block cache: No space left on device
320
write failed: No space left on device
321
No errors were found on the image.
322
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
323
324
Event: refblock_alloc; errno: 28; imm: off; once: off; write -b
325
-Failed to flush the L2 table cache: No space left on device
326
-Failed to flush the refcount block cache: No space left on device
327
+qemu-io: Failed to flush the L2 table cache: No space left on device
328
+qemu-io: Failed to flush the refcount block cache: No space left on device
329
write failed: No space left on device
330
No errors were found on the image.
331
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
332
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
333
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
334
335
Event: refblock_alloc_hookup; errno: 28; imm: off; once: off; write
336
-Failed to flush the L2 table cache: No space left on device
337
-Failed to flush the refcount block cache: No space left on device
338
+qemu-io: Failed to flush the L2 table cache: No space left on device
339
+qemu-io: Failed to flush the refcount block cache: No space left on device
340
write failed: No space left on device
341
342
55 leaked clusters were found on the image.
343
@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
344
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
345
346
Event: refblock_alloc_hookup; errno: 28; imm: off; once: off; write -b
347
-Failed to flush the L2 table cache: No space left on device
348
-Failed to flush the refcount block cache: No space left on device
349
+qemu-io: Failed to flush the L2 table cache: No space left on device
350
+qemu-io: Failed to flush the refcount block cache: No space left on device
351
write failed: No space left on device
352
353
251 leaked clusters were found on the image.
354
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
355
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
356
357
Event: refblock_alloc_write; errno: 28; imm: off; once: off; write
358
-Failed to flush the L2 table cache: No space left on device
359
-Failed to flush the refcount block cache: No space left on device
360
+qemu-io: Failed to flush the L2 table cache: No space left on device
361
+qemu-io: Failed to flush the refcount block cache: No space left on device
362
write failed: No space left on device
363
No errors were found on the image.
364
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
365
366
Event: refblock_alloc_write; errno: 28; imm: off; once: off; write -b
367
-Failed to flush the L2 table cache: No space left on device
368
-Failed to flush the refcount block cache: No space left on device
369
+qemu-io: Failed to flush the L2 table cache: No space left on device
370
+qemu-io: Failed to flush the refcount block cache: No space left on device
371
write failed: No space left on device
372
No errors were found on the image.
373
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
374
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
375
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
376
377
Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: off; write
378
-Failed to flush the L2 table cache: No space left on device
379
-Failed to flush the refcount block cache: No space left on device
380
+qemu-io: Failed to flush the L2 table cache: No space left on device
381
+qemu-io: Failed to flush the refcount block cache: No space left on device
382
write failed: No space left on device
383
384
10 leaked clusters were found on the image.
385
@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
386
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
387
388
Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: off; write -b
389
-Failed to flush the L2 table cache: No space left on device
390
-Failed to flush the refcount block cache: No space left on device
391
+qemu-io: Failed to flush the L2 table cache: No space left on device
392
+qemu-io: Failed to flush the refcount block cache: No space left on device
393
write failed: No space left on device
394
395
23 leaked clusters were found on the image.
396
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
397
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
398
399
Event: refblock_alloc_write_table; errno: 28; imm: off; once: off; write
400
-Failed to flush the L2 table cache: No space left on device
401
-Failed to flush the refcount block cache: No space left on device
402
+qemu-io: Failed to flush the L2 table cache: No space left on device
403
+qemu-io: Failed to flush the refcount block cache: No space left on device
404
write failed: No space left on device
405
406
10 leaked clusters were found on the image.
407
@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
408
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
409
410
Event: refblock_alloc_write_table; errno: 28; imm: off; once: off; write -b
411
-Failed to flush the L2 table cache: No space left on device
412
-Failed to flush the refcount block cache: No space left on device
413
+qemu-io: Failed to flush the L2 table cache: No space left on device
414
+qemu-io: Failed to flush the refcount block cache: No space left on device
415
write failed: No space left on device
416
417
23 leaked clusters were found on the image.
418
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
419
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
420
421
Event: refblock_alloc_switch_table; errno: 28; imm: off; once: off; write
422
-Failed to flush the L2 table cache: No space left on device
423
-Failed to flush the refcount block cache: No space left on device
424
+qemu-io: Failed to flush the L2 table cache: No space left on device
425
+qemu-io: Failed to flush the refcount block cache: No space left on device
426
write failed: No space left on device
427
428
10 leaked clusters were found on the image.
429
@@ -XXX,XX +XXX,XX @@ This means waste of disk space, but no harm to data.
430
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
431
432
Event: refblock_alloc_switch_table; errno: 28; imm: off; once: off; write -b
433
-Failed to flush the L2 table cache: No space left on device
434
-Failed to flush the refcount block cache: No space left on device
435
+qemu-io: Failed to flush the L2 table cache: No space left on device
436
+qemu-io: Failed to flush the refcount block cache: No space left on device
437
write failed: No space left on device
438
439
23 leaked clusters were found on the image.
440
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
441
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
442
443
Event: l1_grow_write_table; errno: 5; imm: off; once: off
444
-Failed to flush the L2 table cache: Input/output error
445
-Failed to flush the refcount block cache: Input/output error
446
+qemu-io: Failed to flush the L2 table cache: Input/output error
447
+qemu-io: Failed to flush the refcount block cache: Input/output error
448
write failed: Input/output error
449
No errors were found on the image.
450
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
451
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
452
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
453
454
Event: l1_grow_write_table; errno: 28; imm: off; once: off
455
-Failed to flush the L2 table cache: No space left on device
456
-Failed to flush the refcount block cache: No space left on device
457
+qemu-io: Failed to flush the L2 table cache: No space left on device
458
+qemu-io: Failed to flush the refcount block cache: No space left on device
459
write failed: No space left on device
460
No errors were found on the image.
461
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
462
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
463
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
464
465
Event: l1_grow_activate_table; errno: 5; imm: off; once: off
466
-Failed to flush the L2 table cache: Input/output error
467
-Failed to flush the refcount block cache: Input/output error
468
+qemu-io: Failed to flush the L2 table cache: Input/output error
469
+qemu-io: Failed to flush the refcount block cache: Input/output error
470
write failed: Input/output error
471
472
96 leaked clusters were found on the image.
473
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
474
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
475
476
Event: l1_grow_activate_table; errno: 28; imm: off; once: off
477
-Failed to flush the L2 table cache: No space left on device
478
-Failed to flush the refcount block cache: No space left on device
479
+qemu-io: Failed to flush the L2 table cache: No space left on device
480
+qemu-io: Failed to flush the refcount block cache: No space left on device
481
write failed: No space left on device
482
483
96 leaked clusters were found on the image.
484
diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out
485
index XXXXXXX..XXXXXXX 100644
486
--- a/tests/qemu-iotests/060.out
487
+++ b/tests/qemu-iotests/060.out
488
@@ -XXX,XX +XXX,XX @@ Format specific information:
489
lazy refcounts: false
490
refcount bits: 16
491
corrupt: true
492
-can't open device TEST_DIR/t.IMGFMT: IMGFMT: Image is corrupt; cannot be opened read/write
493
+qemu-io: can't open device TEST_DIR/t.IMGFMT: IMGFMT: Image is corrupt; cannot be opened read/write
494
no file open, try 'help open'
495
read 512/512 bytes at offset 0
496
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
497
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
498
=== Testing zero refcount table size ===
499
500
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
501
-can't open device TEST_DIR/t.IMGFMT: Image does not contain a reference count table
502
+qemu-io: can't open device TEST_DIR/t.IMGFMT: Image does not contain a reference count table
503
ERROR cluster 0 refcount=0 reference=1
504
ERROR cluster 3 refcount=0 reference=1
505
Rebuilding refcount structure
506
@@ -XXX,XX +XXX,XX @@ Can't get refcount for cluster 2: Input/output error
507
Can't get refcount for cluster 3: Input/output error
508
Rebuilding refcount structure
509
Repairing cluster 1 refcount=1 reference=0
510
-can't open device TEST_DIR/t.IMGFMT: Could not repair dirty image: Input/output error
511
+qemu-io: can't open device TEST_DIR/t.IMGFMT: Could not repair dirty image: Input/output error
512
--- Repairing ---
513
Leaked cluster 1 refcount=1 reference=0
514
Repairing cluster 1 refcount=1 reference=0
515
diff --git a/tests/qemu-iotests/069.out b/tests/qemu-iotests/069.out
516
index XXXXXXX..XXXXXXX 100644
517
--- a/tests/qemu-iotests/069.out
518
+++ b/tests/qemu-iotests/069.out
519
@@ -XXX,XX +XXX,XX @@ QA output created by 069
520
521
Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=131072
522
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=131072 backing_file=TEST_DIR/t.IMGFMT.base
523
-can't open device TEST_DIR/t.IMGFMT: Could not open backing file: Could not open 'TEST_DIR/t.IMGFMT.base': No such file or directory
524
+qemu-io: can't open device TEST_DIR/t.IMGFMT: Could not open backing file: Could not open 'TEST_DIR/t.IMGFMT.base': No such file or directory
525
*** done
526
diff --git a/tests/qemu-iotests/070.out b/tests/qemu-iotests/070.out
527
index XXXXXXX..XXXXXXX 100644
528
--- a/tests/qemu-iotests/070.out
529
+++ b/tests/qemu-iotests/070.out
530
@@ -XXX,XX +XXX,XX @@
531
QA output created by 070
532
533
=== Verify open image read-only fails, due to dirty log ===
534
-can't open device TEST_DIR/iotest-dirtylog-10G-4M.vhdx: VHDX image file 'TEST_DIR/iotest-dirtylog-10G-4M.vhdx' opened read-only, but contains a log that needs to be replayed
535
+qemu-io: can't open device TEST_DIR/iotest-dirtylog-10G-4M.vhdx: VHDX image file 'TEST_DIR/iotest-dirtylog-10G-4M.vhdx' opened read-only, but contains a log that needs to be replayed
536
To replay the log, run:
537
qemu-img check -r all 'TEST_DIR/iotest-dirtylog-10G-4M.vhdx'
538
=== Verify open image replays log ===
539
diff --git a/tests/qemu-iotests/075.out b/tests/qemu-iotests/075.out
540
index XXXXXXX..XXXXXXX 100644
541
--- a/tests/qemu-iotests/075.out
542
+++ b/tests/qemu-iotests/075.out
543
@@ -XXX,XX +XXX,XX @@ read 512/512 bytes at offset 1048064
544
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
545
546
== block_size must be a multiple of 512 ==
547
-can't open device TEST_DIR/simple-pattern.cloop: block_size 513 must be a multiple of 512
548
+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: block_size 513 must be a multiple of 512
549
550
== block_size cannot be zero ==
551
-can't open device TEST_DIR/simple-pattern.cloop: block_size cannot be zero
552
+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: block_size cannot be zero
553
554
== huge block_size ===
555
-can't open device TEST_DIR/simple-pattern.cloop: block_size 4294966784 must be 64 MB or less
556
+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: block_size 4294966784 must be 64 MB or less
557
558
== offsets_size overflow ===
559
-can't open device TEST_DIR/simple-pattern.cloop: n_blocks 4294967295 must be 536870911 or less
560
+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: n_blocks 4294967295 must be 536870911 or less
561
562
== refuse images that require too many offsets ===
563
-can't open device TEST_DIR/simple-pattern.cloop: image requires too many offsets, try increasing block size
564
+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: image requires too many offsets, try increasing block size
565
566
== refuse images with non-monotonically increasing offsets ==
567
-can't open device TEST_DIR/simple-pattern.cloop: offsets not monotonically increasing at index 1, image file is corrupt
568
+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: offsets not monotonically increasing at index 1, image file is corrupt
569
570
== refuse images with invalid compressed block size ==
571
-can't open device TEST_DIR/simple-pattern.cloop: invalid compressed block size at index 1, image file is corrupt
572
+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: invalid compressed block size at index 1, image file is corrupt
573
*** done
574
diff --git a/tests/qemu-iotests/076.out b/tests/qemu-iotests/076.out
575
index XXXXXXX..XXXXXXX 100644
576
--- a/tests/qemu-iotests/076.out
577
+++ b/tests/qemu-iotests/076.out
578
@@ -XXX,XX +XXX,XX @@ read 65536/65536 bytes at offset 0
579
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
580
581
== Negative catalog size ==
582
-can't open device TEST_DIR/parallels-v1: Catalog too large
583
+qemu-io: can't open device TEST_DIR/parallels-v1: Catalog too large
584
585
== Overflow in catalog allocation ==
586
-can't open device TEST_DIR/parallels-v1: Catalog too large
587
+qemu-io: can't open device TEST_DIR/parallels-v1: Catalog too large
588
589
== Zero sectors per track ==
590
-can't open device TEST_DIR/parallels-v1: Invalid image: Zero sectors per track
591
+qemu-io: can't open device TEST_DIR/parallels-v1: Invalid image: Zero sectors per track
592
593
== Read from a valid v2 image ==
594
read 65536/65536 bytes at offset 0
595
diff --git a/tests/qemu-iotests/078.out b/tests/qemu-iotests/078.out
596
index XXXXXXX..XXXXXXX 100644
597
--- a/tests/qemu-iotests/078.out
598
+++ b/tests/qemu-iotests/078.out
599
@@ -XXX,XX +XXX,XX @@ read 512/512 bytes at offset 0
600
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
601
602
== Negative catalog size ==
603
-can't open device TEST_DIR/empty.bochs: Catalog size is too large
604
+qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too large
605
606
== Overflow for catalog size * sizeof(uint32_t) ==
607
-can't open device TEST_DIR/empty.bochs: Catalog size is too large
608
+qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too large
609
610
== Too small catalog bitmap for image size ==
611
-can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
612
-can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
613
+qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
614
+qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
615
616
== Negative extent size ==
617
-can't open device TEST_DIR/empty.bochs: Extent size 2147483648 is too large
618
+qemu-io: can't open device TEST_DIR/empty.bochs: Extent size 2147483648 is too large
619
620
== Zero extent size ==
621
-can't open device TEST_DIR/empty.bochs: Extent size must be at least 512
622
+qemu-io: can't open device TEST_DIR/empty.bochs: Extent size must be at least 512
623
*** done
624
diff --git a/tests/qemu-iotests/080.out b/tests/qemu-iotests/080.out
625
index XXXXXXX..XXXXXXX 100644
626
--- a/tests/qemu-iotests/080.out
627
+++ b/tests/qemu-iotests/080.out
628
@@ -XXX,XX +XXX,XX @@ QA output created by 080
629
630
== Huge header size ==
631
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
632
-can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
633
-can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
634
+qemu-io: can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
635
+qemu-io: can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
636
637
== Huge unknown header extension ==
638
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
639
-can't open device TEST_DIR/t.qcow2: Invalid backing file offset
640
-can't open device TEST_DIR/t.qcow2: Header extension too large
641
-can't open device TEST_DIR/t.qcow2: Header extension too large
642
+qemu-io: can't open device TEST_DIR/t.qcow2: Invalid backing file offset
643
+qemu-io: can't open device TEST_DIR/t.qcow2: Header extension too large
644
+qemu-io: can't open device TEST_DIR/t.qcow2: Header extension too large
645
646
== Huge refcount table size ==
647
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
648
-can't open device TEST_DIR/t.qcow2: Reference count table too large
649
-can't open device TEST_DIR/t.qcow2: Reference count table too large
650
+qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table too large
651
+qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table too large
652
653
== Misaligned refcount table ==
654
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
655
-can't open device TEST_DIR/t.qcow2: Reference count table offset invalid
656
+qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table offset invalid
657
658
== Huge refcount offset ==
659
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
660
-can't open device TEST_DIR/t.qcow2: Reference count table offset invalid
661
+qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table offset invalid
662
663
== Invalid snapshot table ==
664
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
665
-can't open device TEST_DIR/t.qcow2: Snapshot table too large
666
-can't open device TEST_DIR/t.qcow2: Snapshot table too large
667
-can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid
668
-can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid
669
+qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table too large
670
+qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table too large
671
+qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid
672
+qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid
673
674
== Hitting snapshot table size limit ==
675
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
676
@@ -XXX,XX +XXX,XX @@ read 512/512 bytes at offset 0
677
678
== Invalid L1 table ==
679
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
680
-can't open device TEST_DIR/t.qcow2: Active L1 table too large
681
-can't open device TEST_DIR/t.qcow2: Active L1 table too large
682
-can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid
683
-can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid
684
+qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table too large
685
+qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table too large
686
+qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid
687
+qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid
688
689
== Invalid L1 table (with internal snapshot in the image) ==
690
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
691
@@ -XXX,XX +XXX,XX @@ qemu-img: Could not open 'TEST_DIR/t.IMGFMT': L1 table is too small
692
693
== Invalid backing file size ==
694
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
695
-can't open device TEST_DIR/t.qcow2: Backing file name too long
696
+qemu-io: can't open device TEST_DIR/t.qcow2: Backing file name too long
697
698
== Invalid L2 entry (huge physical offset) ==
699
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
700
@@ -XXX,XX +XXX,XX @@ wrote 512/512 bytes at offset 0
701
qemu-img: Failed to load snapshot: Snapshot L1 table offset invalid
702
qemu-img: Snapshot L1 table offset invalid
703
qemu-img: Failed to turn zero into data clusters: Invalid argument
704
-Failed to flush the refcount block cache: Invalid argument
705
+qemu-io: Failed to flush the refcount block cache: Invalid argument
706
write failed: Invalid argument
707
qemu-img: Snapshot L1 table offset invalid
708
qemu-img: Could not apply snapshot 'test': Failed to load snapshot: Invalid argument
709
@@ -XXX,XX +XXX,XX @@ wrote 512/512 bytes at offset 0
710
qemu-img: Failed to load snapshot: Snapshot L1 table too large
711
qemu-img: Snapshot L1 table too large
712
qemu-img: Failed to turn zero into data clusters: File too large
713
-Failed to flush the refcount block cache: File too large
714
+qemu-io: Failed to flush the refcount block cache: File too large
715
write failed: File too large
716
qemu-img: Snapshot L1 table too large
717
qemu-img: Could not apply snapshot 'test': Failed to load snapshot: File too large
718
diff --git a/tests/qemu-iotests/081.out b/tests/qemu-iotests/081.out
719
index XXXXXXX..XXXXXXX 100644
720
--- a/tests/qemu-iotests/081.out
721
+++ b/tests/qemu-iotests/081.out
722
@@ -XXX,XX +XXX,XX @@ read 10485760/10485760 bytes at offset 0
723
10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
724
725
== checking the blkverify mode with invalid settings ==
726
-can't open: blkverify=on can only be set if there are exactly two files and vote-threshold is 2
727
+qemu-io: can't open: blkverify=on can only be set if there are exactly two files and vote-threshold is 2
728
729
== dynamically adding a child to a quorum ==
730
Testing:
731
diff --git a/tests/qemu-iotests/088.out b/tests/qemu-iotests/088.out
732
index XXXXXXX..XXXXXXX 100644
733
--- a/tests/qemu-iotests/088.out
734
+++ b/tests/qemu-iotests/088.out
735
@@ -XXX,XX +XXX,XX @@ QA output created by 088
736
737
== Invalid block size ==
738
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
739
-can't open device TEST_DIR/t.vpc: Invalid block size 0
740
-can't open device TEST_DIR/t.vpc: Invalid block size 0
741
-can't open device TEST_DIR/t.vpc: Invalid block size 128
742
-can't open device TEST_DIR/t.vpc: Invalid block size 128
743
-can't open device TEST_DIR/t.vpc: Invalid block size 305419896
744
-can't open device TEST_DIR/t.vpc: Invalid block size 305419896
745
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 0
746
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 0
747
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 128
748
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 128
749
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 305419896
750
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 305419896
751
*** done
752
diff --git a/tests/qemu-iotests/103.out b/tests/qemu-iotests/103.out
753
index XXXXXXX..XXXXXXX 100644
754
--- a/tests/qemu-iotests/103.out
755
+++ b/tests/qemu-iotests/103.out
756
@@ -XXX,XX +XXX,XX @@ wrote 65536/65536 bytes at offset 0
757
758
=== Testing invalid option combinations ===
759
760
-can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
761
-can't open device TEST_DIR/t.IMGFMT: l2-cache-size may not exceed cache-size
762
-can't open device TEST_DIR/t.IMGFMT: refcount-cache-size may not exceed cache-size
763
-can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
764
-can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
765
-can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
766
-can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
767
+qemu-io: can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
768
+qemu-io: can't open device TEST_DIR/t.IMGFMT: l2-cache-size may not exceed cache-size
769
+qemu-io: can't open device TEST_DIR/t.IMGFMT: refcount-cache-size may not exceed cache-size
770
+qemu-io: can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
771
+qemu-io: can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
772
+qemu-io: can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
773
+qemu-io: can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
774
775
=== Testing valid option combinations ===
776
777
diff --git a/tests/qemu-iotests/114.out b/tests/qemu-iotests/114.out
778
index XXXXXXX..XXXXXXX 100644
779
--- a/tests/qemu-iotests/114.out
780
+++ b/tests/qemu-iotests/114.out
781
@@ -XXX,XX +XXX,XX @@ virtual size: 64M (67108864 bytes)
782
cluster_size: 65536
783
backing file: TEST_DIR/t.IMGFMT.base
784
backing file format: foo
785
-can't open device TEST_DIR/t.qcow2: Could not open backing file: Unknown driver 'foo'
786
+qemu-io: can't open device TEST_DIR/t.qcow2: Could not open backing file: Unknown driver 'foo'
787
no file open, try 'help open'
788
read 4096/4096 bytes at offset 0
789
4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
790
diff --git a/tests/qemu-iotests/116.out b/tests/qemu-iotests/116.out
791
index XXXXXXX..XXXXXXX 100644
792
--- a/tests/qemu-iotests/116.out
793
+++ b/tests/qemu-iotests/116.out
794
@@ -XXX,XX +XXX,XX @@ QA output created by 116
795
796
== truncated header cluster ==
797
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
798
-can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
799
+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
800
801
== invalid header magic ==
802
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
803
-can't open device TEST_DIR/t.qed: Image not in QED format
804
+qemu-io: can't open device TEST_DIR/t.qed: Image not in QED format
805
806
== invalid cluster size ==
807
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
808
-can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
809
+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
810
811
== invalid table size ==
812
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
813
-can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
814
+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
815
816
== invalid header size ==
817
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
818
-can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
819
+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
820
821
== invalid L1 table offset ==
822
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
823
-can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
824
+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
825
826
== invalid image size ==
827
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
828
-can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
829
+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
830
*** done
831
diff --git a/tests/qemu-iotests/131.out b/tests/qemu-iotests/131.out
832
index XXXXXXX..XXXXXXX 100644
833
--- a/tests/qemu-iotests/131.out
834
+++ b/tests/qemu-iotests/131.out
835
@@ -XXX,XX +XXX,XX @@ read 32768/32768 bytes at offset 163840
836
read 32768/32768 bytes at offset 0
837
32 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
838
== Corrupt image ==
839
-can't open device TEST_DIR/t.parallels: parallels: Image was not closed correctly; cannot be opened read/write
840
+qemu-io: can't open device TEST_DIR/t.parallels: parallels: Image was not closed correctly; cannot be opened read/write
841
ERROR image was not closed correctly
842
843
1 errors were found on the image.
844
diff --git a/tests/qemu-iotests/133.out b/tests/qemu-iotests/133.out
845
index XXXXXXX..XXXXXXX 100644
846
--- a/tests/qemu-iotests/133.out
847
+++ b/tests/qemu-iotests/133.out
848
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t
849
850
=== Check that node-name can't be changed ===
851
852
-Cannot change the option 'node-name'
853
-Cannot change the option 'node-name'
854
-Cannot change the option 'node-name'
855
+qemu-io: Cannot change the option 'node-name'
856
+qemu-io: Cannot change the option 'node-name'
857
+qemu-io: Cannot change the option 'node-name'
858
859
=== Check that unchanged node-name is okay ===
860
861
862
=== Check that driver can't be changed ===
863
864
-Cannot change the option 'driver'
865
-Cannot change the option 'driver'
866
-Cannot change the option 'driver'
867
+qemu-io: Cannot change the option 'driver'
868
+qemu-io: Cannot change the option 'driver'
869
+qemu-io: Cannot change the option 'driver'
870
871
=== Check that unchanged driver is okay ===
872
873
@@ -XXX,XX +XXX,XX @@ format name: null-co
874
875
=== Check that mixing -c/-r/-w and their corresponding options is forbidden ===
876
877
-Cannot set both -r/-w and 'read-only'
878
-Cannot set both -r/-w and 'read-only'
879
-Cannot set both -c and the cache options
880
-Cannot set both -c and the cache options
881
-Cannot set both -c and the cache options
882
+qemu-io: Cannot set both -r/-w and 'read-only'
883
+qemu-io: Cannot set both -r/-w and 'read-only'
884
+qemu-io: Cannot set both -c and the cache options
885
+qemu-io: Cannot set both -c and the cache options
886
+qemu-io: Cannot set both -c and the cache options
887
888
=== Check that invalid options are handled correctly ===
889
890
-Parameter 'read-only' expects 'on' or 'off'
891
-Parameter 'cache.no-flush' expects 'on' or 'off'
892
-Parameter 'cache.direct' expects 'on' or 'off'
893
-Parameter 'auto-read-only' expects 'on' or 'off'
894
+qemu-io: Parameter 'read-only' expects 'on' or 'off'
895
+qemu-io: Parameter 'cache.no-flush' expects 'on' or 'off'
896
+qemu-io: Parameter 'cache.direct' expects 'on' or 'off'
897
+qemu-io: Parameter 'auto-read-only' expects 'on' or 'off'
898
*** done
899
diff --git a/tests/qemu-iotests/137.out b/tests/qemu-iotests/137.out
900
index XXXXXXX..XXXXXXX 100644
901
--- a/tests/qemu-iotests/137.out
902
+++ b/tests/qemu-iotests/137.out
903
@@ -XXX,XX +XXX,XX @@ read 33554432/33554432 bytes at offset 0
904
905
=== Try setting some invalid values ===
906
907
-Parameter 'lazy-refcounts' expects 'on' or 'off'
908
-cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
909
-l2-cache-size may not exceed cache-size
910
-refcount-cache-size may not exceed cache-size
911
-L2 cache entry size must be a power of two between 512 and the cluster size (65536)
912
-L2 cache entry size must be a power of two between 512 and the cluster size (65536)
913
-Refcount cache size too big
914
-Conflicting values for qcow2 options 'overlap-check' ('constant') and 'overlap-check.template' ('all')
915
-Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
916
-Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
917
-Cache clean interval too big
918
+qemu-io: Parameter 'lazy-refcounts' expects 'on' or 'off'
919
+qemu-io: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
920
+qemu-io: l2-cache-size may not exceed cache-size
921
+qemu-io: refcount-cache-size may not exceed cache-size
922
+qemu-io: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
923
+qemu-io: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
924
+qemu-io: Refcount cache size too big
925
+qemu-io: Conflicting values for qcow2 options 'overlap-check' ('constant') and 'overlap-check.template' ('all')
926
+qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
927
+qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
928
+qemu-io: Cache clean interval too big
929
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=36028797018963968
930
-L2 cache size too big
931
+qemu-io: L2 cache size too big
932
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
933
934
=== Test transaction semantics ===
935
936
-Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
937
+qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
938
wrote 512/512 bytes at offset 0
939
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
940
./common.rc: Killed ( if [ "${VALGRIND_QEMU}" == "y" ]; then
941
@@ -XXX,XX +XXX,XX @@ incompatible_features 0x0
942
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
943
wrote 65536/65536 bytes at offset 0
944
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
945
-Parameter 'lazy-refcounts' expects 'on' or 'off'
946
+qemu-io: Parameter 'lazy-refcounts' expects 'on' or 'off'
947
qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with qcow2_header); further corruption events will be suppressed
948
write failed: Input/output error
949
*** done
950
diff --git a/tests/qemu-iotests/140.out b/tests/qemu-iotests/140.out
951
index XXXXXXX..XXXXXXX 100644
952
--- a/tests/qemu-iotests/140.out
953
+++ b/tests/qemu-iotests/140.out
954
@@ -XXX,XX +XXX,XX @@ wrote 65536/65536 bytes at offset 0
955
read 65536/65536 bytes at offset 0
956
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
957
{"return": {}}
958
-can't open device nbd+unix:///drv?socket=TEST_DIR/nbd: Requested export not available
959
+qemu-io: can't open device nbd+unix:///drv?socket=TEST_DIR/nbd: Requested export not available
960
server reported: export 'drv' not present
961
{"return": {}}
962
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
963
diff --git a/tests/qemu-iotests/143.out b/tests/qemu-iotests/143.out
964
index XXXXXXX..XXXXXXX 100644
965
--- a/tests/qemu-iotests/143.out
966
+++ b/tests/qemu-iotests/143.out
967
@@ -XXX,XX +XXX,XX @@
968
QA output created by 143
969
{"return": {}}
970
{"return": {}}
971
-can't open device nbd+unix:///no_such_export?socket=TEST_DIR/nbd: Requested export not available
972
+qemu-io: can't open device nbd+unix:///no_such_export?socket=TEST_DIR/nbd: Requested export not available
973
server reported: export 'no_such_export' not present
974
{"return": {}}
975
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
976
diff --git a/tests/qemu-iotests/153.out b/tests/qemu-iotests/153.out
977
index XXXXXXX..XXXXXXX 100644
978
--- a/tests/qemu-iotests/153.out
979
+++ b/tests/qemu-iotests/153.out
980
@@ -XXX,XX +XXX,XX @@ Is another process using the image [TEST_DIR/t.qcow2]?
981
== Running utility commands ==
982
983
_qemu_io_wrapper -c read 0 512 TEST_DIR/t.qcow2
984
-can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
985
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
986
Is another process using the image [TEST_DIR/t.qcow2]?
987
988
_qemu_io_wrapper -r -c read 0 512 TEST_DIR/t.qcow2
989
-can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
990
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
991
Is another process using the image [TEST_DIR/t.qcow2]?
992
993
_qemu_io_wrapper -c open TEST_DIR/t.qcow2 -c read 0 512
994
-can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
995
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
996
Is another process using the image [TEST_DIR/t.qcow2]?
997
no file open, try 'help open'
998
999
_qemu_io_wrapper -c open -r TEST_DIR/t.qcow2 -c read 0 512
1000
-can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
1001
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
1002
Is another process using the image [TEST_DIR/t.qcow2]?
1003
no file open, try 'help open'
1004
1005
@@ -XXX,XX +XXX,XX @@ file format: IMGFMT
1006
== Running utility commands -U ==
1007
1008
_qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2
1009
-can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
1010
+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
1011
1012
_qemu_io_wrapper -U -r -c read 0 512 TEST_DIR/t.qcow2
1013
1014
_qemu_io_wrapper -c open -U TEST_DIR/t.qcow2 -c read 0 512
1015
-can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
1016
+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
1017
no file open, try 'help open'
1018
1019
_qemu_io_wrapper -c open -r -U TEST_DIR/t.qcow2 -c read 0 512
1020
@@ -XXX,XX +XXX,XX @@ Is another process using the image [TEST_DIR/t.qcow2]?
1021
== Running utility commands ==
1022
1023
_qemu_io_wrapper -c read 0 512 TEST_DIR/t.qcow2
1024
-can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
1025
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
1026
Is another process using the image [TEST_DIR/t.qcow2]?
1027
1028
_qemu_io_wrapper -r -c read 0 512 TEST_DIR/t.qcow2
1029
1030
_qemu_io_wrapper -c open TEST_DIR/t.qcow2 -c read 0 512
1031
-can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
1032
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
1033
Is another process using the image [TEST_DIR/t.qcow2]?
1034
no file open, try 'help open'
1035
1036
@@ -XXX,XX +XXX,XX @@ file format: IMGFMT
1037
== Running utility commands -U ==
1038
1039
_qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2
1040
-can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
1041
+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
1042
1043
_qemu_io_wrapper -U -r -c read 0 512 TEST_DIR/t.qcow2
1044
1045
_qemu_io_wrapper -c open -U TEST_DIR/t.qcow2 -c read 0 512
1046
-can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
1047
+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
1048
no file open, try 'help open'
1049
1050
_qemu_io_wrapper -c open -r -U TEST_DIR/t.qcow2 -c read 0 512
1051
@@ -XXX,XX +XXX,XX @@ file format: IMGFMT
1052
== Running utility commands -U ==
1053
1054
_qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2
1055
-can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
1056
+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
1057
1058
_qemu_io_wrapper -U -r -c read 0 512 TEST_DIR/t.qcow2
1059
1060
_qemu_io_wrapper -c open -U TEST_DIR/t.qcow2 -c read 0 512
1061
-can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
1062
+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
1063
no file open, try 'help open'
1064
1065
_qemu_io_wrapper -c open -r -U TEST_DIR/t.qcow2 -c read 0 512
1066
@@ -XXX,XX +XXX,XX @@ Adding drive
1067
{"return": "OKrn"}
1068
1069
_qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512
1070
-can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
1071
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
1072
Is another process using the image [TEST_DIR/t.qcow2]?
1073
Creating overlay with qemu-img when the guest is running should be allowed
1074
1075
@@ -XXX,XX +XXX,XX @@ _qemu_img_wrapper info TEST_DIR/t.qcow2
1076
{"return": ""}
1077
1078
_qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512
1079
-can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
1080
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
1081
Is another process using the image [TEST_DIR/t.qcow2]?
1082
Closing the other
1083
{"return": ""}
1084
@@ -XXX,XX +XXX,XX @@ qemu-img: --force-share/-U conflicts with image options
1085
No conflict:
1086
1087
Conflict:
1088
--U conflicts with image options
1089
+qemu-io: -U conflicts with image options
1090
*** done
1091
diff --git a/tests/qemu-iotests/187.out b/tests/qemu-iotests/187.out
1092
index XXXXXXX..XXXXXXX 100644
1093
--- a/tests/qemu-iotests/187.out
1094
+++ b/tests/qemu-iotests/187.out
1095
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
1096
1097
Start from read-only
1098
1099
-Block node is read-only
1100
+qemu-io: Block node is read-only
1101
wrote 65536/65536 bytes at offset 0
1102
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
1103
-Block node is read-only
1104
+qemu-io: Block node is read-only
1105
1106
Start from read-write
1107
1108
wrote 65536/65536 bytes at offset 0
1109
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
1110
-Block node is read-only
1111
+qemu-io: Block node is read-only
1112
wrote 65536/65536 bytes at offset 0
1113
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
1114
*** done
1115
diff --git a/tests/qemu-iotests/188.out b/tests/qemu-iotests/188.out
1116
index XXXXXXX..XXXXXXX 100644
1117
--- a/tests/qemu-iotests/188.out
1118
+++ b/tests/qemu-iotests/188.out
1119
@@ -XXX,XX +XXX,XX @@ read 16777216/16777216 bytes at offset 0
1120
16 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
1121
1122
== verify open failure with wrong password ==
1123
-can't open: Invalid password, cannot unlock any keyslot
1124
+qemu-io: can't open: Invalid password, cannot unlock any keyslot
1125
*** done
1126
diff --git a/tests/qemu-iotests/197.out b/tests/qemu-iotests/197.out
1127
index XXXXXXX..XXXXXXX 100644
1128
--- a/tests/qemu-iotests/197.out
1129
+++ b/tests/qemu-iotests/197.out
1130
@@ -XXX,XX +XXX,XX @@ read 2147483136/2147483136 bytes at offset 1024
1131
2 GiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
1132
read 1024/1024 bytes at offset 3221226496
1133
1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
1134
-can't open device TEST_DIR/t.wrap.qcow2: Can't use copy-on-read on read-only device
1135
+qemu-io: can't open device TEST_DIR/t.wrap.qcow2: Can't use copy-on-read on read-only device
1136
2 GiB (0x80010000) bytes allocated at offset 0 bytes (0x0)
1137
1023.938 MiB (0x3fff0000) bytes not allocated at offset 2 GiB (0x80010000)
1138
64 KiB (0x10000) bytes allocated at offset 3 GiB (0xc0000000)
1139
diff --git a/tests/qemu-iotests/205 b/tests/qemu-iotests/205
1140
index XXXXXXX..XXXXXXX 100755
23
index XXXXXXX..XXXXXXX 100755
1141
--- a/tests/qemu-iotests/205
24
--- a/tests/qemu-iotests/244
1142
+++ b/tests/qemu-iotests/205
25
+++ b/tests/qemu-iotests/244
1143
@@ -XXX,XX +XXX,XX @@ class TestNbdServerRemove(iotests.QMPTestCase):
26
@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c 'read -P 0 0 1M' \
1144
27
echo
1145
def assertConnectFailed(self, qemu_io_output):
28
$QEMU_IO -c 'read -P 0 0 1M' \
1146
self.assertEqual(filter_qemu_io(qemu_io_output).strip(),
29
-c 'read -P 0x11 1M 1M' \
1147
- "can't open device " + nbd_uri +
30
- -c 'read -P 0 2M 2M' \
1148
+ "qemu-io: can't open device " + nbd_uri +
31
-c 'read -P 0x11 4M 1M' \
1149
": Requested export not available\n"
32
-c 'read -P 0 5M 1M' \
1150
"server reported: export 'exp' not present")
33
-f raw "$TEST_IMG.data" |
1151
34
@@ -XXX,XX +XXX,XX @@ $QEMU_IO -c 'read -P 0 0 1M' \
1152
diff --git a/tests/qemu-iotests/215.out b/tests/qemu-iotests/215.out
35
-f $IMGFMT "$TEST_IMG" |
1153
index XXXXXXX..XXXXXXX 100644
36
_filter_qemu_io
1154
--- a/tests/qemu-iotests/215.out
37
1155
+++ b/tests/qemu-iotests/215.out
38
+# Discarded clusters are only marked as such in the qcow2 metadata, but
1156
@@ -XXX,XX +XXX,XX @@ read 2147483136/2147483136 bytes at offset 1024
39
+# they can contain stale data in the external data file. Instead, zero
1157
2 GiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
40
+# clusters must be zeroed in the external data file too.
1158
read 1024/1024 bytes at offset 3221226496
41
echo
1159
1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
42
-$QEMU_IMG compare "$TEST_IMG" "$TEST_IMG.data"
1160
-can't open device TEST_DIR/t.wrap.qcow2: Block node is read-only
43
+$QEMU_IO -c 'read -P 0 0 1M' \
1161
+qemu-io: can't open device TEST_DIR/t.wrap.qcow2: Block node is read-only
44
+ -c 'read -P 0x11 1M 1M' \
1162
2 GiB (0x80010000) bytes allocated at offset 0 bytes (0x0)
45
+ -c 'read -P 0 3M 3M' \
1163
1023.938 MiB (0x3fff0000) bytes not allocated at offset 2 GiB (0x80010000)
46
+ -f raw "$TEST_IMG".data |
1164
64 KiB (0x10000) bytes allocated at offset 3 GiB (0xc0000000)
47
+ _filter_qemu_io
1165
diff --git a/tests/qemu-iotests/226.out b/tests/qemu-iotests/226.out
48
1166
index XXXXXXX..XXXXXXX 100644
49
echo -n "qcow2 file size after I/O: "
1167
--- a/tests/qemu-iotests/226.out
50
du -b $TEST_IMG | cut -f1
1168
+++ b/tests/qemu-iotests/226.out
1169
@@ -XXX,XX +XXX,XX @@ QA output created by 226
1170
=== Testing with driver:file ===
1171
1172
== Testing RO ==
1173
-can't open: A regular file was expected by the 'file' driver, but something else was given
1174
-warning: Opening a character device as a file using the 'file' driver is deprecated
1175
+qemu-io: can't open: A regular file was expected by the 'file' driver, but something else was given
1176
+qemu-io: warning: Opening a character device as a file using the 'file' driver is deprecated
1177
== Testing RW ==
1178
-can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
1179
-warning: Opening a character device as a file using the 'file' driver is deprecated
1180
+qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
1181
+qemu-io: warning: Opening a character device as a file using the 'file' driver is deprecated
1182
1183
=== Testing with driver:host_device ===
1184
1185
== Testing RO ==
1186
-can't open: 'host_device' driver expects either a character or block device
1187
+qemu-io: can't open: 'host_device' driver expects either a character or block device
1188
== Testing RW ==
1189
-can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
1190
+qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
1191
1192
=== Testing with driver:host_cdrom ===
1193
1194
== Testing RO ==
1195
-can't open: 'host_cdrom' driver expects either a character or block device
1196
+qemu-io: can't open: 'host_cdrom' driver expects either a character or block device
1197
== Testing RW ==
1198
-can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
1199
+qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
1200
1201
*** done
1202
diff --git a/tests/qemu-iotests/244.out b/tests/qemu-iotests/244.out
51
diff --git a/tests/qemu-iotests/244.out b/tests/qemu-iotests/244.out
1203
index XXXXXXX..XXXXXXX 100644
52
index XXXXXXX..XXXXXXX 100644
1204
--- a/tests/qemu-iotests/244.out
53
--- a/tests/qemu-iotests/244.out
1205
+++ b/tests/qemu-iotests/244.out
54
+++ b/tests/qemu-iotests/244.out
1206
@@ -XXX,XX +XXX,XX @@ read 65536/65536 bytes at offset 0
55
@@ -XXX,XX +XXX,XX @@ read 1048576/1048576 bytes at offset 0
1207
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
56
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
1208
read 65536/65536 bytes at offset 0
57
read 1048576/1048576 bytes at offset 1048576
1209
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
58
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
1210
-can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
59
-read 2097152/2097152 bytes at offset 2097152
1211
+qemu-io: can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
60
-2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
1212
no file open, try 'help open'
61
read 1048576/1048576 bytes at offset 4194304
1213
62
1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
1214
Data file required, but without data file name in the image:
63
read 1048576/1048576 bytes at offset 5242880
1215
-can't open device TEST_DIR/t.qcow2: 'data-file' is required for this image
64
@@ -XXX,XX +XXX,XX @@ read 1048576/1048576 bytes at offset 1048576
1216
+qemu-io: can't open device TEST_DIR/t.qcow2: 'data-file' is required for this image
65
read 4194304/4194304 bytes at offset 2097152
1217
no file open, try 'help open'
66
4 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
1218
read 65536/65536 bytes at offset 0
67
1219
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
68
-Images are identical.
1220
-can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
69
+read 1048576/1048576 bytes at offset 0
1221
+qemu-io: can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
70
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
1222
no file open, try 'help open'
71
+read 1048576/1048576 bytes at offset 1048576
1223
72
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
1224
Setting data-file for an image with internal data:
73
+read 3145728/3145728 bytes at offset 3145728
1225
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
74
+3 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
1226
-can't open device TEST_DIR/t.qcow2: 'data-file' can only be set for images with an external data file
75
qcow2 file size after I/O: 327680
1227
+qemu-io: can't open device TEST_DIR/t.qcow2: 'data-file' can only be set for images with an external data file
76
1228
no file open, try 'help open'
77
=== bdrv_co_block_status test for file and offset=0 ===
1229
-can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
1230
+qemu-io: can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
1231
no file open, try 'help open'
1232
1233
=== Conflicting features ===
1234
--
78
--
1235
2.20.1
79
2.25.3
1236
80
1237
81
diff view generated by jsdifflib
Deleted patch
1
Even for block nodes with bs->drv == NULL, we can't just ignore a
2
bdrv_set_aio_context() call. Leaving the node in its old context can
3
mean that it's still in an iothread context in bdrv_close_all() during
4
shutdown, resulting in an attempted unlock of the AioContext lock which
5
we don't hold.
6
1
7
This is an example stack trace of a related crash:
8
9
#0 0x00007ffff59da57f in raise () at /lib64/libc.so.6
10
#1 0x00007ffff59c4895 in abort () at /lib64/libc.so.6
11
#2 0x0000555555b97b1e in error_exit (err=<optimized out>, msg=msg@entry=0x555555d386d0 <__func__.19059> "qemu_mutex_unlock_impl") at util/qemu-thread-posix.c:36
12
#3 0x0000555555b97f7f in qemu_mutex_unlock_impl (mutex=mutex@entry=0x5555568002f0, file=file@entry=0x555555d378df "util/async.c", line=line@entry=507) at util/qemu-thread-posix.c:97
13
#4 0x0000555555b92f55 in aio_context_release (ctx=ctx@entry=0x555556800290) at util/async.c:507
14
#5 0x0000555555b05cf8 in bdrv_prwv_co (child=child@entry=0x7fffc80012f0, offset=offset@entry=131072, qiov=qiov@entry=0x7fffffffd4f0, is_write=is_write@entry=true, flags=flags@entry=0)
15
at block/io.c:833
16
#6 0x0000555555b060a9 in bdrv_pwritev (qiov=0x7fffffffd4f0, offset=131072, child=0x7fffc80012f0) at block/io.c:990
17
#7 0x0000555555b060a9 in bdrv_pwrite (child=0x7fffc80012f0, offset=131072, buf=<optimized out>, bytes=<optimized out>) at block/io.c:990
18
#8 0x0000555555ae172b in qcow2_cache_entry_flush (bs=bs@entry=0x555556810680, c=c@entry=0x5555568cc740, i=i@entry=0) at block/qcow2-cache.c:51
19
#9 0x0000555555ae18dd in qcow2_cache_write (bs=bs@entry=0x555556810680, c=0x5555568cc740) at block/qcow2-cache.c:248
20
#10 0x0000555555ae15de in qcow2_cache_flush (bs=0x555556810680, c=<optimized out>) at block/qcow2-cache.c:259
21
#11 0x0000555555ae16b1 in qcow2_cache_flush_dependency (c=0x5555568a1700, c=0x5555568a1700, bs=0x555556810680) at block/qcow2-cache.c:194
22
#12 0x0000555555ae16b1 in qcow2_cache_entry_flush (bs=bs@entry=0x555556810680, c=c@entry=0x5555568a1700, i=i@entry=0) at block/qcow2-cache.c:194
23
#13 0x0000555555ae18dd in qcow2_cache_write (bs=bs@entry=0x555556810680, c=0x5555568a1700) at block/qcow2-cache.c:248
24
#14 0x0000555555ae15de in qcow2_cache_flush (bs=bs@entry=0x555556810680, c=<optimized out>) at block/qcow2-cache.c:259
25
#15 0x0000555555ad242c in qcow2_inactivate (bs=bs@entry=0x555556810680) at block/qcow2.c:2124
26
#16 0x0000555555ad2590 in qcow2_close (bs=0x555556810680) at block/qcow2.c:2153
27
#17 0x0000555555ab0c62 in bdrv_close (bs=0x555556810680) at block.c:3358
28
#18 0x0000555555ab0c62 in bdrv_delete (bs=0x555556810680) at block.c:3542
29
#19 0x0000555555ab0c62 in bdrv_unref (bs=0x555556810680) at block.c:4598
30
#20 0x0000555555af4d72 in blk_remove_bs (blk=blk@entry=0x5555568103d0) at block/block-backend.c:785
31
#21 0x0000555555af4dbb in blk_remove_all_bs () at block/block-backend.c:483
32
#22 0x0000555555aae02f in bdrv_close_all () at block.c:3412
33
#23 0x00005555557f9796 in main (argc=<optimized out>, argv=<optimized out>, envp=<optimized out>) at vl.c:4776
34
35
The reproducer I used is a qcow2 image on gluster volume, where the
36
virtual disk size (4 GB) is larger than the gluster volume size (64M),
37
so we can easily trigger an ENOSPC. This backend is assigned to a
38
virtio-blk device using an iothread, and then from the guest a
39
'dd if=/dev/zero of=/dev/vda bs=1G count=1' causes the VM to stop
40
because of an I/O error. qemu_gluster_co_flush_to_disk() sets
41
bs->drv = NULL on error, so when virtio-blk stops the dataplane, the
42
block nodes stay in the iothread AioContext. A 'quit' monitor command
43
issued from this paused state crashes the process.
44
45
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1631227
46
Cc: qemu-stable@nongnu.org
47
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
48
Reviewed-by: Eric Blake <eblake@redhat.com>
49
Reviewed-by: Max Reitz <mreitz@redhat.com>
50
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
51
---
52
block.c | 12 ++----------
53
1 file changed, 2 insertions(+), 10 deletions(-)
54
55
diff --git a/block.c b/block.c
56
index XXXXXXX..XXXXXXX 100644
57
--- a/block.c
58
+++ b/block.c
59
@@ -XXX,XX +XXX,XX @@ void bdrv_detach_aio_context(BlockDriverState *bs)
60
BdrvAioNotifier *baf, *baf_tmp;
61
BdrvChild *child;
62
63
- if (!bs->drv) {
64
- return;
65
- }
66
-
67
assert(!bs->walking_aio_notifiers);
68
bs->walking_aio_notifiers = true;
69
QLIST_FOREACH_SAFE(baf, &bs->aio_notifiers, list, baf_tmp) {
70
@@ -XXX,XX +XXX,XX @@ void bdrv_detach_aio_context(BlockDriverState *bs)
71
*/
72
bs->walking_aio_notifiers = false;
73
74
- if (bs->drv->bdrv_detach_aio_context) {
75
+ if (bs->drv && bs->drv->bdrv_detach_aio_context) {
76
bs->drv->bdrv_detach_aio_context(bs);
77
}
78
QLIST_FOREACH(child, &bs->children, next) {
79
@@ -XXX,XX +XXX,XX @@ void bdrv_attach_aio_context(BlockDriverState *bs,
80
BdrvAioNotifier *ban, *ban_tmp;
81
BdrvChild *child;
82
83
- if (!bs->drv) {
84
- return;
85
- }
86
-
87
if (bs->quiesce_counter) {
88
aio_disable_external(new_context);
89
}
90
@@ -XXX,XX +XXX,XX @@ void bdrv_attach_aio_context(BlockDriverState *bs,
91
QLIST_FOREACH(child, &bs->children, next) {
92
bdrv_attach_aio_context(child->bs, new_context);
93
}
94
- if (bs->drv->bdrv_attach_aio_context) {
95
+ if (bs->drv && bs->drv->bdrv_attach_aio_context) {
96
bs->drv->bdrv_attach_aio_context(bs, new_context);
97
}
98
99
--
100
2.20.1
101
102
diff view generated by jsdifflib
1
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
1
This adds a new BdrvRequestFlags parameter to the .bdrv_co_truncate()
2
2
driver callbacks, and a supported_truncate_flags field in
3
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
3
BlockDriverState that allows drivers to advertise support for request
4
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
4
flags in the context of truncate.
5
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
5
6
For now, we always pass 0 and no drivers declare support for any flag.
7
8
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
9
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
10
Reviewed-by: Alberto Garcia <berto@igalia.com>
11
Reviewed-by: Max Reitz <mreitz@redhat.com>
12
Message-Id: <20200424125448.63318-2-kwolf@redhat.com>
6
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
13
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
7
---
14
---
8
include/block/block_int.h | 16 ++++++++++++++++
15
include/block/block_int.h | 10 +++++++++-
9
include/sysemu/block-backend.h | 19 +++++++++++++++++++
16
block/crypto.c | 3 ++-
10
2 files changed, 35 insertions(+)
17
block/file-posix.c | 2 +-
18
block/file-win32.c | 2 +-
19
block/gluster.c | 1 +
20
block/io.c | 8 +++++++-
21
block/iscsi.c | 2 +-
22
block/nfs.c | 3 ++-
23
block/qcow2.c | 2 +-
24
block/qed.c | 1 +
25
block/raw-format.c | 2 +-
26
block/rbd.c | 1 +
27
block/sheepdog.c | 4 ++--
28
block/ssh.c | 2 +-
29
tests/test-block-iothread.c | 3 ++-
30
15 files changed, 33 insertions(+), 13 deletions(-)
11
31
12
diff --git a/include/block/block_int.h b/include/block/block_int.h
32
diff --git a/include/block/block_int.h b/include/block/block_int.h
13
index XXXXXXX..XXXXXXX 100644
33
index XXXXXXX..XXXXXXX 100644
14
--- a/include/block/block_int.h
34
--- a/include/block/block_int.h
15
+++ b/include/block/block_int.h
35
+++ b/include/block/block_int.h
16
@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_pwritev(BdrvChild *child,
36
@@ -XXX,XX +XXX,XX @@ struct BlockDriver {
17
int64_t offset, unsigned int bytes, QEMUIOVector *qiov,
37
*/
18
BdrvRequestFlags flags);
38
int coroutine_fn (*bdrv_co_truncate)(BlockDriverState *bs, int64_t offset,
19
39
bool exact, PreallocMode prealloc,
20
+static inline int coroutine_fn bdrv_co_pread(BdrvChild *child,
40
- Error **errp);
21
+ int64_t offset, unsigned int bytes, void *buf, BdrvRequestFlags flags)
41
+ BdrvRequestFlags flags, Error **errp);
22
+{
42
23
+ QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
43
int64_t (*bdrv_getlength)(BlockDriverState *bs);
24
+
44
bool has_variable_length;
25
+ return bdrv_co_preadv(child, offset, bytes, &qiov, flags);
45
@@ -XXX,XX +XXX,XX @@ struct BlockDriverState {
26
+}
46
/* Flags honored during pwrite_zeroes (so far: BDRV_REQ_FUA,
27
+
47
* BDRV_REQ_MAY_UNMAP, BDRV_REQ_WRITE_UNCHANGED) */
28
+static inline int coroutine_fn bdrv_co_pwrite(BdrvChild *child,
48
unsigned int supported_zero_flags;
29
+ int64_t offset, unsigned int bytes, void *buf, BdrvRequestFlags flags)
49
+ /*
30
+{
50
+ * Flags honoured during truncate (so far: BDRV_REQ_ZERO_WRITE).
31
+ QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
51
+ *
32
+
52
+ * If BDRV_REQ_ZERO_WRITE is given, the truncate operation must make sure
33
+ return bdrv_co_pwritev(child, offset, bytes, &qiov, flags);
53
+ * that any added space reads as all zeros. If this can't be guaranteed,
34
+}
54
+ * the operation must fail.
35
+
55
+ */
36
extern unsigned int bdrv_drain_all_count;
56
+ unsigned int supported_truncate_flags;
37
void bdrv_apply_subtree_drain(BdrvChild *child, BlockDriverState *new_parent);
57
38
void bdrv_unapply_subtree_drain(BdrvChild *child, BlockDriverState *old_parent);
58
/* the following member gives a name to every node on the bs graph. */
39
diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h
59
char node_name[32];
40
index XXXXXXX..XXXXXXX 100644
60
diff --git a/block/crypto.c b/block/crypto.c
41
--- a/include/sysemu/block-backend.h
61
index XXXXXXX..XXXXXXX 100644
42
+++ b/include/sysemu/block-backend.h
62
--- a/block/crypto.c
43
@@ -XXX,XX +XXX,XX @@ int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,
63
+++ b/block/crypto.c
44
int coroutine_fn blk_co_pwritev(BlockBackend *blk, int64_t offset,
64
@@ -XXX,XX +XXX,XX @@ static int block_crypto_co_create_generic(BlockDriverState *bs,
45
unsigned int bytes, QEMUIOVector *qiov,
65
46
BdrvRequestFlags flags);
66
static int coroutine_fn
47
+
67
block_crypto_co_truncate(BlockDriverState *bs, int64_t offset, bool exact,
48
+static inline int coroutine_fn blk_co_pread(BlockBackend *blk, int64_t offset,
68
- PreallocMode prealloc, Error **errp)
49
+ unsigned int bytes, void *buf,
69
+ PreallocMode prealloc, BdrvRequestFlags flags,
50
+ BdrvRequestFlags flags)
70
+ Error **errp)
51
+{
71
{
52
+ QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
72
BlockCrypto *crypto = bs->opaque;
53
+
73
uint64_t payload_offset =
54
+ return blk_co_preadv(blk, offset, bytes, &qiov, flags);
74
diff --git a/block/file-posix.c b/block/file-posix.c
55
+}
75
index XXXXXXX..XXXXXXX 100644
56
+
76
--- a/block/file-posix.c
57
+static inline int coroutine_fn blk_co_pwrite(BlockBackend *blk, int64_t offset,
77
+++ b/block/file-posix.c
58
+ unsigned int bytes, void *buf,
78
@@ -XXX,XX +XXX,XX @@ raw_regular_truncate(BlockDriverState *bs, int fd, int64_t offset,
59
+ BdrvRequestFlags flags)
79
60
+{
80
static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset,
61
+ QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
81
bool exact, PreallocMode prealloc,
62
+
82
- Error **errp)
63
+ return blk_co_pwritev(blk, offset, bytes, &qiov, flags);
83
+ BdrvRequestFlags flags, Error **errp)
64
+}
84
{
65
+
85
BDRVRawState *s = bs->opaque;
66
int blk_pwrite_zeroes(BlockBackend *blk, int64_t offset,
86
struct stat st;
67
int bytes, BdrvRequestFlags flags);
87
diff --git a/block/file-win32.c b/block/file-win32.c
68
BlockAIOCB *blk_aio_pwrite_zeroes(BlockBackend *blk, int64_t offset,
88
index XXXXXXX..XXXXXXX 100644
89
--- a/block/file-win32.c
90
+++ b/block/file-win32.c
91
@@ -XXX,XX +XXX,XX @@ static void raw_close(BlockDriverState *bs)
92
93
static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset,
94
bool exact, PreallocMode prealloc,
95
- Error **errp)
96
+ BdrvRequestFlags flags, Error **errp)
97
{
98
BDRVRawState *s = bs->opaque;
99
LONG low, high;
100
diff --git a/block/gluster.c b/block/gluster.c
101
index XXXXXXX..XXXXXXX 100644
102
--- a/block/gluster.c
103
+++ b/block/gluster.c
104
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qemu_gluster_co_truncate(BlockDriverState *bs,
105
int64_t offset,
106
bool exact,
107
PreallocMode prealloc,
108
+ BdrvRequestFlags flags,
109
Error **errp)
110
{
111
BDRVGlusterState *s = bs->opaque;
112
diff --git a/block/io.c b/block/io.c
113
index XXXXXXX..XXXXXXX 100644
114
--- a/block/io.c
115
+++ b/block/io.c
116
@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset, bool exact,
117
BlockDriverState *bs = child->bs;
118
BlockDriver *drv = bs->drv;
119
BdrvTrackedRequest req;
120
+ BdrvRequestFlags flags = 0;
121
int64_t old_size, new_bytes;
122
int ret;
123
124
@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset, bool exact,
125
}
126
127
if (drv->bdrv_co_truncate) {
128
- ret = drv->bdrv_co_truncate(bs, offset, exact, prealloc, errp);
129
+ if (flags & ~bs->supported_truncate_flags) {
130
+ error_setg(errp, "Block driver does not support requested flags");
131
+ ret = -ENOTSUP;
132
+ goto out;
133
+ }
134
+ ret = drv->bdrv_co_truncate(bs, offset, exact, prealloc, flags, errp);
135
} else if (bs->file && drv->is_filter) {
136
ret = bdrv_co_truncate(bs->file, offset, exact, prealloc, errp);
137
} else {
138
diff --git a/block/iscsi.c b/block/iscsi.c
139
index XXXXXXX..XXXXXXX 100644
140
--- a/block/iscsi.c
141
+++ b/block/iscsi.c
142
@@ -XXX,XX +XXX,XX @@ static void iscsi_reopen_commit(BDRVReopenState *reopen_state)
143
144
static int coroutine_fn iscsi_co_truncate(BlockDriverState *bs, int64_t offset,
145
bool exact, PreallocMode prealloc,
146
- Error **errp)
147
+ BdrvRequestFlags flags, Error **errp)
148
{
149
IscsiLun *iscsilun = bs->opaque;
150
int64_t cur_length;
151
diff --git a/block/nfs.c b/block/nfs.c
152
index XXXXXXX..XXXXXXX 100644
153
--- a/block/nfs.c
154
+++ b/block/nfs.c
155
@@ -XXX,XX +XXX,XX @@ static int64_t nfs_get_allocated_file_size(BlockDriverState *bs)
156
157
static int coroutine_fn
158
nfs_file_co_truncate(BlockDriverState *bs, int64_t offset, bool exact,
159
- PreallocMode prealloc, Error **errp)
160
+ PreallocMode prealloc, BdrvRequestFlags flags,
161
+ Error **errp)
162
{
163
NFSClient *client = bs->opaque;
164
int ret;
165
diff --git a/block/qcow2.c b/block/qcow2.c
166
index XXXXXXX..XXXXXXX 100644
167
--- a/block/qcow2.c
168
+++ b/block/qcow2.c
169
@@ -XXX,XX +XXX,XX @@ fail:
170
171
static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
172
bool exact, PreallocMode prealloc,
173
- Error **errp)
174
+ BdrvRequestFlags flags, Error **errp)
175
{
176
BDRVQcow2State *s = bs->opaque;
177
uint64_t old_length;
178
diff --git a/block/qed.c b/block/qed.c
179
index XXXXXXX..XXXXXXX 100644
180
--- a/block/qed.c
181
+++ b/block/qed.c
182
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn bdrv_qed_co_truncate(BlockDriverState *bs,
183
int64_t offset,
184
bool exact,
185
PreallocMode prealloc,
186
+ BdrvRequestFlags flags,
187
Error **errp)
188
{
189
BDRVQEDState *s = bs->opaque;
190
diff --git a/block/raw-format.c b/block/raw-format.c
191
index XXXXXXX..XXXXXXX 100644
192
--- a/block/raw-format.c
193
+++ b/block/raw-format.c
194
@@ -XXX,XX +XXX,XX @@ static void raw_refresh_limits(BlockDriverState *bs, Error **errp)
195
196
static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset,
197
bool exact, PreallocMode prealloc,
198
- Error **errp)
199
+ BdrvRequestFlags flags, Error **errp)
200
{
201
BDRVRawState *s = bs->opaque;
202
203
diff --git a/block/rbd.c b/block/rbd.c
204
index XXXXXXX..XXXXXXX 100644
205
--- a/block/rbd.c
206
+++ b/block/rbd.c
207
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qemu_rbd_co_truncate(BlockDriverState *bs,
208
int64_t offset,
209
bool exact,
210
PreallocMode prealloc,
211
+ BdrvRequestFlags flags,
212
Error **errp)
213
{
214
int r;
215
diff --git a/block/sheepdog.c b/block/sheepdog.c
216
index XXXXXXX..XXXXXXX 100644
217
--- a/block/sheepdog.c
218
+++ b/block/sheepdog.c
219
@@ -XXX,XX +XXX,XX @@ static int64_t sd_getlength(BlockDriverState *bs)
220
221
static int coroutine_fn sd_co_truncate(BlockDriverState *bs, int64_t offset,
222
bool exact, PreallocMode prealloc,
223
- Error **errp)
224
+ BdrvRequestFlags flags, Error **errp)
225
{
226
BDRVSheepdogState *s = bs->opaque;
227
int ret, fd;
228
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int sd_co_writev(BlockDriverState *bs, int64_t sector_num,
229
230
assert(!flags);
231
if (offset > s->inode.vdi_size) {
232
- ret = sd_co_truncate(bs, offset, false, PREALLOC_MODE_OFF, NULL);
233
+ ret = sd_co_truncate(bs, offset, false, PREALLOC_MODE_OFF, 0, NULL);
234
if (ret < 0) {
235
return ret;
236
}
237
diff --git a/block/ssh.c b/block/ssh.c
238
index XXXXXXX..XXXXXXX 100644
239
--- a/block/ssh.c
240
+++ b/block/ssh.c
241
@@ -XXX,XX +XXX,XX @@ static int64_t ssh_getlength(BlockDriverState *bs)
242
243
static int coroutine_fn ssh_co_truncate(BlockDriverState *bs, int64_t offset,
244
bool exact, PreallocMode prealloc,
245
- Error **errp)
246
+ BdrvRequestFlags flags, Error **errp)
247
{
248
BDRVSSHState *s = bs->opaque;
249
250
diff --git a/tests/test-block-iothread.c b/tests/test-block-iothread.c
251
index XXXXXXX..XXXXXXX 100644
252
--- a/tests/test-block-iothread.c
253
+++ b/tests/test-block-iothread.c
254
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn bdrv_test_co_pdiscard(BlockDriverState *bs,
255
256
static int coroutine_fn
257
bdrv_test_co_truncate(BlockDriverState *bs, int64_t offset, bool exact,
258
- PreallocMode prealloc, Error **errp)
259
+ PreallocMode prealloc, BdrvRequestFlags flags,
260
+ Error **errp)
261
{
262
return 0;
263
}
69
--
264
--
70
2.20.1
265
2.25.3
71
266
72
267
diff view generated by jsdifflib
1
From: Stefano Garzarella <sgarzare@redhat.com>
1
Now that block drivers can support flags for .bdrv_co_truncate, expose
2
the parameter in the node level interfaces bdrv_co_truncate() and
3
bdrv_truncate().
2
4
3
Using IEC binary prefixes in order to make the code more readable,
5
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
4
with the exception of DEFAULT_LOG_SIZE because it's passed to
6
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
5
stringify().
7
Reviewed-by: Alberto Garcia <berto@igalia.com>
6
8
Reviewed-by: Max Reitz <mreitz@redhat.com>
7
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
9
Message-Id: <20200424125448.63318-3-kwolf@redhat.com>
8
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
9
Reviewed-by: John Snow <jsnow@redhat.com>
10
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
10
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
11
---
11
---
12
block/vhdx.h | 10 ++++++----
12
include/block/block.h | 5 +++--
13
block/vhdx-log.c | 2 +-
13
block/block-backend.c | 2 +-
14
block/vhdx.c | 4 ++--
14
block/crypto.c | 2 +-
15
3 files changed, 9 insertions(+), 7 deletions(-)
15
block/io.c | 12 +++++++-----
16
block/parallels.c | 6 +++---
17
block/qcow.c | 4 ++--
18
block/qcow2-refcount.c | 2 +-
19
block/qcow2.c | 15 +++++++++------
20
block/raw-format.c | 2 +-
21
block/vhdx-log.c | 2 +-
22
block/vhdx.c | 2 +-
23
block/vmdk.c | 2 +-
24
tests/test-block-iothread.c | 6 +++---
25
13 files changed, 34 insertions(+), 28 deletions(-)
16
26
17
diff --git a/block/vhdx.h b/block/vhdx.h
27
diff --git a/include/block/block.h b/include/block/block.h
18
index XXXXXXX..XXXXXXX 100644
28
index XXXXXXX..XXXXXXX 100644
19
--- a/block/vhdx.h
29
--- a/include/block/block.h
20
+++ b/block/vhdx.h
30
+++ b/include/block/block.h
21
@@ -XXX,XX +XXX,XX @@
31
@@ -XXX,XX +XXX,XX @@ BlockDriverState *bdrv_find_backing_image(BlockDriverState *bs,
22
#include "qemu/units.h"
32
void bdrv_refresh_filename(BlockDriverState *bs);
23
33
24
#define DEFAULT_LOG_SIZE 1048576 /* 1MiB */
34
int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset, bool exact,
25
+/* Note: can't use 1 * MiB, because it's passed to stringify() */
35
- PreallocMode prealloc, Error **errp);
26
+
36
+ PreallocMode prealloc, BdrvRequestFlags flags,
27
/* Structures and fields present in the VHDX file */
37
+ Error **errp);
28
38
int bdrv_truncate(BdrvChild *child, int64_t offset, bool exact,
29
/* The header section has the following blocks,
39
- PreallocMode prealloc, Error **errp);
30
@@ -XXX,XX +XXX,XX @@
40
+ PreallocMode prealloc, BdrvRequestFlags flags, Error **errp);
31
* 0.........64KB...........128KB........192KB..........256KB................1MB
41
42
int64_t bdrv_nb_sectors(BlockDriverState *bs);
43
int64_t bdrv_getlength(BlockDriverState *bs);
44
diff --git a/block/block-backend.c b/block/block-backend.c
45
index XXXXXXX..XXXXXXX 100644
46
--- a/block/block-backend.c
47
+++ b/block/block-backend.c
48
@@ -XXX,XX +XXX,XX @@ int blk_truncate(BlockBackend *blk, int64_t offset, bool exact,
49
return -ENOMEDIUM;
50
}
51
52
- return bdrv_truncate(blk->root, offset, exact, prealloc, errp);
53
+ return bdrv_truncate(blk->root, offset, exact, prealloc, 0, errp);
54
}
55
56
int blk_save_vmstate(BlockBackend *blk, const uint8_t *buf,
57
diff --git a/block/crypto.c b/block/crypto.c
58
index XXXXXXX..XXXXXXX 100644
59
--- a/block/crypto.c
60
+++ b/block/crypto.c
61
@@ -XXX,XX +XXX,XX @@ block_crypto_co_truncate(BlockDriverState *bs, int64_t offset, bool exact,
62
63
offset += payload_offset;
64
65
- return bdrv_co_truncate(bs->file, offset, exact, prealloc, errp);
66
+ return bdrv_co_truncate(bs->file, offset, exact, prealloc, 0, errp);
67
}
68
69
static void block_crypto_close(BlockDriverState *bs)
70
diff --git a/block/io.c b/block/io.c
71
index XXXXXXX..XXXXXXX 100644
72
--- a/block/io.c
73
+++ b/block/io.c
74
@@ -XXX,XX +XXX,XX @@ static void bdrv_parent_cb_resize(BlockDriverState *bs)
75
* 'offset' bytes in length.
32
*/
76
*/
33
77
int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset, bool exact,
34
-#define VHDX_HEADER_BLOCK_SIZE (64 * 1024)
78
- PreallocMode prealloc, Error **errp)
35
+#define VHDX_HEADER_BLOCK_SIZE (64 * KiB)
79
+ PreallocMode prealloc, BdrvRequestFlags flags,
36
80
+ Error **errp)
37
#define VHDX_FILE_ID_OFFSET 0
81
{
38
#define VHDX_HEADER1_OFFSET (VHDX_HEADER_BLOCK_SIZE * 1)
82
BlockDriverState *bs = child->bs;
39
@@ -XXX,XX +XXX,XX @@ typedef struct QEMU_PACKED MSGUID {
83
BlockDriver *drv = bs->drv;
40
#define guid_eq(a, b) \
84
BdrvTrackedRequest req;
41
(memcmp(&(a), &(b), sizeof(MSGUID)) == 0)
85
- BdrvRequestFlags flags = 0;
42
86
int64_t old_size, new_bytes;
43
-#define VHDX_HEADER_SIZE (4 * 1024) /* although the vhdx_header struct in disk
87
int ret;
44
+#define VHDX_HEADER_SIZE (4 * KiB) /* although the vhdx_header struct in disk
88
45
is only 582 bytes, for purposes of crc
89
@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset, bool exact,
46
the header is the first 4KB of the 64KB
90
}
47
block */
91
ret = drv->bdrv_co_truncate(bs, offset, exact, prealloc, flags, errp);
48
@@ -XXX,XX +XXX,XX @@ typedef struct QEMU_PACKED VHDXRegionTableEntry {
92
} else if (bs->file && drv->is_filter) {
49
93
- ret = bdrv_co_truncate(bs->file, offset, exact, prealloc, errp);
50
94
+ ret = bdrv_co_truncate(bs->file, offset, exact, prealloc, flags, errp);
51
/* ---- LOG ENTRY STRUCTURES ---- */
95
} else {
52
-#define VHDX_LOG_MIN_SIZE (1024 * 1024)
96
error_setg(errp, "Image format driver does not support resize");
53
-#define VHDX_LOG_SECTOR_SIZE 4096
97
ret = -ENOTSUP;
54
+#define VHDX_LOG_MIN_SIZE (1 * MiB)
98
@@ -XXX,XX +XXX,XX @@ typedef struct TruncateCo {
55
+#define VHDX_LOG_SECTOR_SIZE (4 * KiB)
99
int64_t offset;
56
#define VHDX_LOG_HDR_SIZE 64
100
bool exact;
57
#define VHDX_LOG_SIGNATURE 0x65676f6c
101
PreallocMode prealloc;
58
typedef struct QEMU_PACKED VHDXLogEntryHeader {
102
+ BdrvRequestFlags flags;
103
Error **errp;
104
int ret;
105
} TruncateCo;
106
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn bdrv_truncate_co_entry(void *opaque)
107
{
108
TruncateCo *tco = opaque;
109
tco->ret = bdrv_co_truncate(tco->child, tco->offset, tco->exact,
110
- tco->prealloc, tco->errp);
111
+ tco->prealloc, tco->flags, tco->errp);
112
aio_wait_kick();
113
}
114
115
int bdrv_truncate(BdrvChild *child, int64_t offset, bool exact,
116
- PreallocMode prealloc, Error **errp)
117
+ PreallocMode prealloc, BdrvRequestFlags flags, Error **errp)
118
{
119
Coroutine *co;
120
TruncateCo tco = {
121
@@ -XXX,XX +XXX,XX @@ int bdrv_truncate(BdrvChild *child, int64_t offset, bool exact,
122
.offset = offset,
123
.exact = exact,
124
.prealloc = prealloc,
125
+ .flags = flags,
126
.errp = errp,
127
.ret = NOT_DONE,
128
};
129
diff --git a/block/parallels.c b/block/parallels.c
130
index XXXXXXX..XXXXXXX 100644
131
--- a/block/parallels.c
132
+++ b/block/parallels.c
133
@@ -XXX,XX +XXX,XX @@ static int64_t allocate_clusters(BlockDriverState *bs, int64_t sector_num,
134
} else {
135
ret = bdrv_truncate(bs->file,
136
(s->data_end + space) << BDRV_SECTOR_BITS,
137
- false, PREALLOC_MODE_OFF, NULL);
138
+ false, PREALLOC_MODE_OFF, 0, NULL);
139
}
140
if (ret < 0) {
141
return ret;
142
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn parallels_co_check(BlockDriverState *bs,
143
* That means we have to pass exact=true.
144
*/
145
ret = bdrv_truncate(bs->file, res->image_end_offset, true,
146
- PREALLOC_MODE_OFF, &local_err);
147
+ PREALLOC_MODE_OFF, 0, &local_err);
148
if (ret < 0) {
149
error_report_err(local_err);
150
res->check_errors++;
151
@@ -XXX,XX +XXX,XX @@ static void parallels_close(BlockDriverState *bs)
152
153
/* errors are ignored, so we might as well pass exact=true */
154
bdrv_truncate(bs->file, s->data_end << BDRV_SECTOR_BITS, true,
155
- PREALLOC_MODE_OFF, NULL);
156
+ PREALLOC_MODE_OFF, 0, NULL);
157
}
158
159
g_free(s->bat_dirty_bmap);
160
diff --git a/block/qcow.c b/block/qcow.c
161
index XXXXXXX..XXXXXXX 100644
162
--- a/block/qcow.c
163
+++ b/block/qcow.c
164
@@ -XXX,XX +XXX,XX @@ static int get_cluster_offset(BlockDriverState *bs,
165
return -E2BIG;
166
}
167
ret = bdrv_truncate(bs->file, cluster_offset + s->cluster_size,
168
- false, PREALLOC_MODE_OFF, NULL);
169
+ false, PREALLOC_MODE_OFF, 0, NULL);
170
if (ret < 0) {
171
return ret;
172
}
173
@@ -XXX,XX +XXX,XX @@ static int qcow_make_empty(BlockDriverState *bs)
174
l1_length) < 0)
175
return -1;
176
ret = bdrv_truncate(bs->file, s->l1_table_offset + l1_length, false,
177
- PREALLOC_MODE_OFF, NULL);
178
+ PREALLOC_MODE_OFF, 0, NULL);
179
if (ret < 0)
180
return ret;
181
182
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
183
index XXXXXXX..XXXXXXX 100644
184
--- a/block/qcow2-refcount.c
185
+++ b/block/qcow2-refcount.c
186
@@ -XXX,XX +XXX,XX @@ static int check_refblocks(BlockDriverState *bs, BdrvCheckResult *res,
187
}
188
189
ret = bdrv_truncate(bs->file, offset + s->cluster_size, false,
190
- PREALLOC_MODE_OFF, &local_err);
191
+ PREALLOC_MODE_OFF, 0, &local_err);
192
if (ret < 0) {
193
error_report_err(local_err);
194
goto resize_fail;
195
diff --git a/block/qcow2.c b/block/qcow2.c
196
index XXXXXXX..XXXXXXX 100644
197
--- a/block/qcow2.c
198
+++ b/block/qcow2.c
199
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,
200
mode = PREALLOC_MODE_OFF;
201
}
202
ret = bdrv_co_truncate(s->data_file, host_offset + cur_bytes, false,
203
- mode, errp);
204
+ mode, 0, errp);
205
if (ret < 0) {
206
return ret;
207
}
208
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
209
* always fulfilled, so there is no need to pass it on.)
210
*/
211
bdrv_co_truncate(bs->file, (last_cluster + 1) * s->cluster_size,
212
- false, PREALLOC_MODE_OFF, &local_err);
213
+ false, PREALLOC_MODE_OFF, 0, &local_err);
214
if (local_err) {
215
warn_reportf_err(local_err,
216
"Failed to truncate the tail of the image: ");
217
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
218
* file should be resized to the exact target size, too,
219
* so we pass @exact here.
220
*/
221
- ret = bdrv_co_truncate(s->data_file, offset, exact, prealloc, errp);
222
+ ret = bdrv_co_truncate(s->data_file, offset, exact, prealloc, 0,
223
+ errp);
224
if (ret < 0) {
225
goto fail;
226
}
227
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
228
new_file_size = allocation_start +
229
nb_new_data_clusters * s->cluster_size;
230
/* Image file grows, so @exact does not matter */
231
- ret = bdrv_co_truncate(bs->file, new_file_size, false, prealloc, errp);
232
+ ret = bdrv_co_truncate(bs->file, new_file_size, false, prealloc, 0,
233
+ errp);
234
if (ret < 0) {
235
error_prepend(errp, "Failed to resize underlying file: ");
236
qcow2_free_clusters(bs, allocation_start,
237
@@ -XXX,XX +XXX,XX @@ qcow2_co_pwritev_compressed_part(BlockDriverState *bs,
238
if (len < 0) {
239
return len;
240
}
241
- return bdrv_co_truncate(bs->file, len, false, PREALLOC_MODE_OFF, NULL);
242
+ return bdrv_co_truncate(bs->file, len, false, PREALLOC_MODE_OFF, 0,
243
+ NULL);
244
}
245
246
if (offset_into_cluster(s, offset)) {
247
@@ -XXX,XX +XXX,XX @@ static int make_completely_empty(BlockDriverState *bs)
248
}
249
250
ret = bdrv_truncate(bs->file, (3 + l1_clusters) * s->cluster_size, false,
251
- PREALLOC_MODE_OFF, &local_err);
252
+ PREALLOC_MODE_OFF, 0, &local_err);
253
if (ret < 0) {
254
error_report_err(local_err);
255
goto fail;
256
diff --git a/block/raw-format.c b/block/raw-format.c
257
index XXXXXXX..XXXXXXX 100644
258
--- a/block/raw-format.c
259
+++ b/block/raw-format.c
260
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset,
261
262
s->size = offset;
263
offset += s->offset;
264
- return bdrv_co_truncate(bs->file, offset, exact, prealloc, errp);
265
+ return bdrv_co_truncate(bs->file, offset, exact, prealloc, 0, errp);
266
}
267
268
static void raw_eject(BlockDriverState *bs, bool eject_flag)
59
diff --git a/block/vhdx-log.c b/block/vhdx-log.c
269
diff --git a/block/vhdx-log.c b/block/vhdx-log.c
60
index XXXXXXX..XXXXXXX 100644
270
index XXXXXXX..XXXXXXX 100644
61
--- a/block/vhdx-log.c
271
--- a/block/vhdx-log.c
62
+++ b/block/vhdx-log.c
272
+++ b/block/vhdx-log.c
63
@@ -XXX,XX +XXX,XX @@ static int vhdx_log_flush(BlockDriverState *bs, BDRVVHDXState *s,
273
@@ -XXX,XX +XXX,XX @@ static int vhdx_log_flush(BlockDriverState *bs, BDRVVHDXState *s,
64
}
274
goto exit;
65
if (file_length < desc_entries->hdr.last_file_offset) {
275
}
66
new_file_size = desc_entries->hdr.last_file_offset;
276
ret = bdrv_truncate(bs->file, new_file_size, false,
67
- if (new_file_size % (1024*1024)) {
277
- PREALLOC_MODE_OFF, NULL);
68
+ if (new_file_size % (1 * MiB)) {
278
+ PREALLOC_MODE_OFF, 0, NULL);
69
/* round up to nearest 1MB boundary */
279
if (ret < 0) {
70
new_file_size = QEMU_ALIGN_UP(new_file_size, MiB);
280
goto exit;
71
if (new_file_size > INT64_MAX) {
281
}
72
diff --git a/block/vhdx.c b/block/vhdx.c
282
diff --git a/block/vhdx.c b/block/vhdx.c
73
index XXXXXXX..XXXXXXX 100644
283
index XXXXXXX..XXXXXXX 100644
74
--- a/block/vhdx.c
284
--- a/block/vhdx.c
75
+++ b/block/vhdx.c
285
+++ b/block/vhdx.c
76
@@ -XXX,XX +XXX,XX @@ static int vhdx_allocate_block(BlockDriverState *bs, BDRVVHDXState *s,
286
@@ -XXX,XX +XXX,XX @@ static int vhdx_allocate_block(BlockDriverState *bs, BDRVVHDXState *s,
77
*new_offset = current_len;
287
}
78
288
79
/* per the spec, the address for a block is in units of 1MB */
289
return bdrv_truncate(bs->file, *new_offset + s->block_size, false,
80
- *new_offset = ROUND_UP(*new_offset, 1024 * 1024);
290
- PREALLOC_MODE_OFF, NULL);
81
+ *new_offset = ROUND_UP(*new_offset, 1 * MiB);
291
+ PREALLOC_MODE_OFF, 0, NULL);
82
if (*new_offset > INT64_MAX) {
292
}
83
return -EINVAL;
293
84
}
294
/*
85
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int vhdx_co_writev(BlockDriverState *bs, int64_t sector_num,
295
diff --git a/block/vmdk.c b/block/vmdk.c
86
case PAYLOAD_BLOCK_FULLY_PRESENT:
296
index XXXXXXX..XXXXXXX 100644
87
/* if the file offset address is in the header zone,
297
--- a/block/vmdk.c
88
* there is a problem */
298
+++ b/block/vmdk.c
89
- if (sinfo.file_offset < (1024 * 1024)) {
299
@@ -XXX,XX +XXX,XX @@ vmdk_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset,
90
+ if (sinfo.file_offset < (1 * MiB)) {
300
}
91
ret = -EFAULT;
301
length = QEMU_ALIGN_UP(length, BDRV_SECTOR_SIZE);
92
goto error_bat_restore;
302
ret = bdrv_truncate(s->extents[i].file, length, false,
93
}
303
- PREALLOC_MODE_OFF, NULL);
304
+ PREALLOC_MODE_OFF, 0, NULL);
305
if (ret < 0) {
306
return ret;
307
}
308
diff --git a/tests/test-block-iothread.c b/tests/test-block-iothread.c
309
index XXXXXXX..XXXXXXX 100644
310
--- a/tests/test-block-iothread.c
311
+++ b/tests/test-block-iothread.c
312
@@ -XXX,XX +XXX,XX @@ static void test_sync_op_truncate(BdrvChild *c)
313
int ret;
314
315
/* Normal success path */
316
- ret = bdrv_truncate(c, 65536, false, PREALLOC_MODE_OFF, NULL);
317
+ ret = bdrv_truncate(c, 65536, false, PREALLOC_MODE_OFF, 0, NULL);
318
g_assert_cmpint(ret, ==, 0);
319
320
/* Early error: Negative offset */
321
- ret = bdrv_truncate(c, -2, false, PREALLOC_MODE_OFF, NULL);
322
+ ret = bdrv_truncate(c, -2, false, PREALLOC_MODE_OFF, 0, NULL);
323
g_assert_cmpint(ret, ==, -EINVAL);
324
325
/* Error: Read-only image */
326
c->bs->read_only = true;
327
c->bs->open_flags &= ~BDRV_O_RDWR;
328
329
- ret = bdrv_truncate(c, 65536, false, PREALLOC_MODE_OFF, NULL);
330
+ ret = bdrv_truncate(c, 65536, false, PREALLOC_MODE_OFF, 0, NULL);
331
g_assert_cmpint(ret, ==, -EACCES);
332
333
c->bs->read_only = false;
94
--
334
--
95
2.20.1
335
2.25.3
96
336
97
337
diff view generated by jsdifflib
1
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
1
Now that node level interface bdrv_truncate() supports passing request
2
2
flags to the block driver, expose this on the BlockBackend level, too.
3
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
3
4
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
4
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
5
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
5
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
6
Reviewed-by: Alberto Garcia <berto@igalia.com>
7
Reviewed-by: Max Reitz <mreitz@redhat.com>
8
Message-Id: <20200424125448.63318-4-kwolf@redhat.com>
6
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
9
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
7
---
10
---
8
block/commit.c | 5 ++---
11
include/sysemu/block-backend.h | 2 +-
9
1 file changed, 2 insertions(+), 3 deletions(-)
12
block.c | 3 ++-
10
13
block/block-backend.c | 4 ++--
14
block/commit.c | 4 ++--
15
block/crypto.c | 2 +-
16
block/mirror.c | 2 +-
17
block/qcow2.c | 4 ++--
18
block/qed.c | 2 +-
19
block/vdi.c | 2 +-
20
block/vhdx.c | 4 ++--
21
block/vmdk.c | 6 +++---
22
block/vpc.c | 2 +-
23
blockdev.c | 2 +-
24
qemu-img.c | 2 +-
25
qemu-io-cmds.c | 2 +-
26
15 files changed, 22 insertions(+), 21 deletions(-)
27
28
diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h
29
index XXXXXXX..XXXXXXX 100644
30
--- a/include/sysemu/block-backend.h
31
+++ b/include/sysemu/block-backend.h
32
@@ -XXX,XX +XXX,XX @@ int coroutine_fn blk_co_pwrite_zeroes(BlockBackend *blk, int64_t offset,
33
int blk_pwrite_compressed(BlockBackend *blk, int64_t offset, const void *buf,
34
int bytes);
35
int blk_truncate(BlockBackend *blk, int64_t offset, bool exact,
36
- PreallocMode prealloc, Error **errp);
37
+ PreallocMode prealloc, BdrvRequestFlags flags, Error **errp);
38
int blk_pdiscard(BlockBackend *blk, int64_t offset, int bytes);
39
int blk_save_vmstate(BlockBackend *blk, const uint8_t *buf,
40
int64_t pos, int size);
41
diff --git a/block.c b/block.c
42
index XXXXXXX..XXXXXXX 100644
43
--- a/block.c
44
+++ b/block.c
45
@@ -XXX,XX +XXX,XX @@ static int64_t create_file_fallback_truncate(BlockBackend *blk,
46
int64_t size;
47
int ret;
48
49
- ret = blk_truncate(blk, minimum_size, false, PREALLOC_MODE_OFF, &local_err);
50
+ ret = blk_truncate(blk, minimum_size, false, PREALLOC_MODE_OFF, 0,
51
+ &local_err);
52
if (ret < 0 && ret != -ENOTSUP) {
53
error_propagate(errp, local_err);
54
return ret;
55
diff --git a/block/block-backend.c b/block/block-backend.c
56
index XXXXXXX..XXXXXXX 100644
57
--- a/block/block-backend.c
58
+++ b/block/block-backend.c
59
@@ -XXX,XX +XXX,XX @@ int blk_pwrite_compressed(BlockBackend *blk, int64_t offset, const void *buf,
60
}
61
62
int blk_truncate(BlockBackend *blk, int64_t offset, bool exact,
63
- PreallocMode prealloc, Error **errp)
64
+ PreallocMode prealloc, BdrvRequestFlags flags, Error **errp)
65
{
66
if (!blk_is_available(blk)) {
67
error_setg(errp, "No medium inserted");
68
return -ENOMEDIUM;
69
}
70
71
- return bdrv_truncate(blk->root, offset, exact, prealloc, 0, errp);
72
+ return bdrv_truncate(blk->root, offset, exact, prealloc, flags, errp);
73
}
74
75
int blk_save_vmstate(BlockBackend *blk, const uint8_t *buf,
11
diff --git a/block/commit.c b/block/commit.c
76
diff --git a/block/commit.c b/block/commit.c
12
index XXXXXXX..XXXXXXX 100644
77
index XXXXXXX..XXXXXXX 100644
13
--- a/block/commit.c
78
--- a/block/commit.c
14
+++ b/block/commit.c
79
+++ b/block/commit.c
15
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn commit_populate(BlockBackend *bs, BlockBackend *base,
80
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn commit_run(Job *job, Error **errp)
16
void *buf)
81
}
17
{
82
18
int ret = 0;
83
if (base_len < len) {
19
- QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
84
- ret = blk_truncate(s->base, len, false, PREALLOC_MODE_OFF, NULL);
20
85
+ ret = blk_truncate(s->base, len, false, PREALLOC_MODE_OFF, 0, NULL);
21
assert(bytes < SIZE_MAX);
86
if (ret) {
22
87
goto out;
23
- ret = blk_co_preadv(bs, offset, qiov.size, &qiov, 0);
88
}
24
+ ret = blk_co_pread(bs, offset, bytes, buf, 0);
89
@@ -XXX,XX +XXX,XX @@ int bdrv_commit(BlockDriverState *bs)
90
* grow the backing file image if possible. If not possible,
91
* we must return an error */
92
if (length > backing_length) {
93
- ret = blk_truncate(backing, length, false, PREALLOC_MODE_OFF,
94
+ ret = blk_truncate(backing, length, false, PREALLOC_MODE_OFF, 0,
95
&local_err);
96
if (ret < 0) {
97
error_report_err(local_err);
98
diff --git a/block/crypto.c b/block/crypto.c
99
index XXXXXXX..XXXXXXX 100644
100
--- a/block/crypto.c
101
+++ b/block/crypto.c
102
@@ -XXX,XX +XXX,XX @@ static ssize_t block_crypto_init_func(QCryptoBlock *block,
103
* which will be used by the crypto header
104
*/
105
return blk_truncate(data->blk, data->size + headerlen, false,
106
- data->prealloc, errp);
107
+ data->prealloc, 0, errp);
108
}
109
110
111
diff --git a/block/mirror.c b/block/mirror.c
112
index XXXXXXX..XXXXXXX 100644
113
--- a/block/mirror.c
114
+++ b/block/mirror.c
115
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn mirror_run(Job *job, Error **errp)
116
117
if (s->bdev_length > base_length) {
118
ret = blk_truncate(s->target, s->bdev_length, false,
119
- PREALLOC_MODE_OFF, NULL);
120
+ PREALLOC_MODE_OFF, 0, NULL);
121
if (ret < 0) {
122
goto immediate_exit;
123
}
124
diff --git a/block/qcow2.c b/block/qcow2.c
125
index XXXXXXX..XXXXXXX 100644
126
--- a/block/qcow2.c
127
+++ b/block/qcow2.c
128
@@ -XXX,XX +XXX,XX @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)
129
130
/* Okay, now that we have a valid image, let's give it the right size */
131
ret = blk_truncate(blk, qcow2_opts->size, false, qcow2_opts->preallocation,
132
- errp);
133
+ 0, errp);
134
if (ret < 0) {
135
error_prepend(errp, "Could not resize image: ");
136
goto out;
137
@@ -XXX,XX +XXX,XX @@ static int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts,
138
* Amending image options should ensure that the image has
139
* exactly the given new values, so pass exact=true here.
140
*/
141
- ret = blk_truncate(blk, new_size, true, PREALLOC_MODE_OFF, errp);
142
+ ret = blk_truncate(blk, new_size, true, PREALLOC_MODE_OFF, 0, errp);
143
blk_unref(blk);
144
if (ret < 0) {
145
return ret;
146
diff --git a/block/qed.c b/block/qed.c
147
index XXXXXXX..XXXXXXX 100644
148
--- a/block/qed.c
149
+++ b/block/qed.c
150
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn bdrv_qed_co_create(BlockdevCreateOptions *opts,
151
* The QED format associates file length with allocation status,
152
* so a new file (which is empty) must have a length of 0.
153
*/
154
- ret = blk_truncate(blk, 0, true, PREALLOC_MODE_OFF, errp);
155
+ ret = blk_truncate(blk, 0, true, PREALLOC_MODE_OFF, 0, errp);
156
if (ret < 0) {
157
goto out;
158
}
159
diff --git a/block/vdi.c b/block/vdi.c
160
index XXXXXXX..XXXXXXX 100644
161
--- a/block/vdi.c
162
+++ b/block/vdi.c
163
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vdi_co_do_create(BlockdevCreateOptions *create_options,
164
165
if (image_type == VDI_TYPE_STATIC) {
166
ret = blk_truncate(blk, offset + blocks * block_size, false,
167
- PREALLOC_MODE_OFF, errp);
168
+ PREALLOC_MODE_OFF, 0, errp);
169
if (ret < 0) {
170
error_prepend(errp, "Failed to statically allocate file");
171
goto exit;
172
diff --git a/block/vhdx.c b/block/vhdx.c
173
index XXXXXXX..XXXXXXX 100644
174
--- a/block/vhdx.c
175
+++ b/block/vhdx.c
176
@@ -XXX,XX +XXX,XX @@ static int vhdx_create_bat(BlockBackend *blk, BDRVVHDXState *s,
177
/* All zeroes, so we can just extend the file - the end of the BAT
178
* is the furthest thing we have written yet */
179
ret = blk_truncate(blk, data_file_offset, false, PREALLOC_MODE_OFF,
180
- errp);
181
+ 0, errp);
182
if (ret < 0) {
183
goto exit;
184
}
185
} else if (type == VHDX_TYPE_FIXED) {
186
ret = blk_truncate(blk, data_file_offset + image_size, false,
187
- PREALLOC_MODE_OFF, errp);
188
+ PREALLOC_MODE_OFF, 0, errp);
189
if (ret < 0) {
190
goto exit;
191
}
192
diff --git a/block/vmdk.c b/block/vmdk.c
193
index XXXXXXX..XXXXXXX 100644
194
--- a/block/vmdk.c
195
+++ b/block/vmdk.c
196
@@ -XXX,XX +XXX,XX @@ static int vmdk_init_extent(BlockBackend *blk,
197
int gd_buf_size;
198
199
if (flat) {
200
- ret = blk_truncate(blk, filesize, false, PREALLOC_MODE_OFF, errp);
201
+ ret = blk_truncate(blk, filesize, false, PREALLOC_MODE_OFF, 0, errp);
202
goto exit;
203
}
204
magic = cpu_to_be32(VMDK4_MAGIC);
205
@@ -XXX,XX +XXX,XX @@ static int vmdk_init_extent(BlockBackend *blk,
206
}
207
208
ret = blk_truncate(blk, le64_to_cpu(header.grain_offset) << 9, false,
209
- PREALLOC_MODE_OFF, errp);
210
+ PREALLOC_MODE_OFF, 0, errp);
211
if (ret < 0) {
212
goto exit;
213
}
214
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vmdk_co_do_create(int64_t size,
215
/* bdrv_pwrite write padding zeros to align to sector, we don't need that
216
* for description file */
217
if (desc_offset == 0) {
218
- ret = blk_truncate(blk, desc_len, false, PREALLOC_MODE_OFF, errp);
219
+ ret = blk_truncate(blk, desc_len, false, PREALLOC_MODE_OFF, 0, errp);
220
if (ret < 0) {
221
goto exit;
222
}
223
diff --git a/block/vpc.c b/block/vpc.c
224
index XXXXXXX..XXXXXXX 100644
225
--- a/block/vpc.c
226
+++ b/block/vpc.c
227
@@ -XXX,XX +XXX,XX @@ static int create_fixed_disk(BlockBackend *blk, uint8_t *buf,
228
/* Add footer to total size */
229
total_size += HEADER_SIZE;
230
231
- ret = blk_truncate(blk, total_size, false, PREALLOC_MODE_OFF, errp);
232
+ ret = blk_truncate(blk, total_size, false, PREALLOC_MODE_OFF, 0, errp);
25
if (ret < 0) {
233
if (ret < 0) {
26
return ret;
234
return ret;
27
}
235
}
28
236
diff --git a/blockdev.c b/blockdev.c
29
- ret = blk_co_pwritev(base, offset, qiov.size, &qiov, 0);
237
index XXXXXXX..XXXXXXX 100644
30
+ ret = blk_co_pwrite(base, offset, bytes, buf, 0);
238
--- a/blockdev.c
31
if (ret < 0) {
239
+++ b/blockdev.c
240
@@ -XXX,XX +XXX,XX @@ void qmp_block_resize(bool has_device, const char *device,
241
}
242
243
bdrv_drained_begin(bs);
244
- ret = blk_truncate(blk, size, false, PREALLOC_MODE_OFF, errp);
245
+ ret = blk_truncate(blk, size, false, PREALLOC_MODE_OFF, 0, errp);
246
bdrv_drained_end(bs);
247
248
out:
249
diff --git a/qemu-img.c b/qemu-img.c
250
index XXXXXXX..XXXXXXX 100644
251
--- a/qemu-img.c
252
+++ b/qemu-img.c
253
@@ -XXX,XX +XXX,XX @@ static int img_resize(int argc, char **argv)
254
* resizing, so pass @exact=true. It is of no use to report
255
* success when the image has not actually been resized.
256
*/
257
- ret = blk_truncate(blk, total_size, true, prealloc, &err);
258
+ ret = blk_truncate(blk, total_size, true, prealloc, 0, &err);
259
if (!ret) {
260
qprintf(quiet, "Image resized.\n");
261
} else {
262
diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c
263
index XXXXXXX..XXXXXXX 100644
264
--- a/qemu-io-cmds.c
265
+++ b/qemu-io-cmds.c
266
@@ -XXX,XX +XXX,XX @@ static int truncate_f(BlockBackend *blk, int argc, char **argv)
267
* exact=true. It is better to err on the "emit more errors" side
268
* than to be overly permissive.
269
*/
270
- ret = blk_truncate(blk, offset, true, PREALLOC_MODE_OFF, &local_err);
271
+ ret = blk_truncate(blk, offset, true, PREALLOC_MODE_OFF, 0, &local_err);
272
if (ret < 0) {
273
error_report_err(local_err);
32
return ret;
274
return ret;
33
}
34
--
275
--
35
2.20.1
276
2.25.3
36
277
37
278
diff view generated by jsdifflib
1
preallocate_co() already gave the data file the full size without
1
If BDRV_REQ_ZERO_WRITE is set and we're extending the image, calling
2
forwarding the requested preallocation mode to the protocol. When
2
qcow2_cluster_zeroize() with flags=0 does the right thing: It doesn't
3
bdrv_co_truncate() was called later with the preallocation mode, the
3
undo any previous preallocation, but just adds the zero flag to all
4
file didn't actually grow any more, so the data file stayed unallocated
4
relevant L2 entries. If an external data file is in use, a write_zeroes
5
even if full preallocation was requested.
5
request to the data file is made instead.
6
6
7
Pass the right preallocation mode to preallocate_co() and remove the
7
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
8
second bdrv_co_truncate() to fix this. As a side effect, the ugly
8
Message-Id: <20200424125448.63318-5-kwolf@redhat.com>
9
one-byte write in preallocate_co() is replaced with a truncate call,
9
Reviewed-by: Eric Blake <eblake@redhat.com>
10
now leaving the last block unallocated on the protocol level as it
10
Reviewed-by: Max Reitz <mreitz@redhat.com>
11
should be.
11
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
12
---
13
block/qcow2-cluster.c | 2 +-
14
block/qcow2.c | 34 ++++++++++++++++++++++++++++++++++
15
2 files changed, 35 insertions(+), 1 deletion(-)
12
16
13
Cc: qemu-stable@nongnu.org
17
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
14
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
18
index XXXXXXX..XXXXXXX 100644
15
Reviewed-by: Eric Blake <eblake@redhat.com>
19
--- a/block/qcow2-cluster.c
16
---
20
+++ b/block/qcow2-cluster.c
17
block/qcow2.c | 41 +++++++++++++++++++++++------------------
21
@@ -XXX,XX +XXX,XX @@ int qcow2_cluster_zeroize(BlockDriverState *bs, uint64_t offset,
18
1 file changed, 23 insertions(+), 18 deletions(-)
22
/* Caller must pass aligned values, except at image end */
19
23
assert(QEMU_IS_ALIGNED(offset, s->cluster_size));
24
assert(QEMU_IS_ALIGNED(end_offset, s->cluster_size) ||
25
- end_offset == bs->total_sectors << BDRV_SECTOR_BITS);
26
+ end_offset >= bs->total_sectors << BDRV_SECTOR_BITS);
27
28
/* The zero flag is only supported by version 3 and newer */
29
if (s->qcow_version < 3) {
20
diff --git a/block/qcow2.c b/block/qcow2.c
30
diff --git a/block/qcow2.c b/block/qcow2.c
21
index XXXXXXX..XXXXXXX 100644
31
index XXXXXXX..XXXXXXX 100644
22
--- a/block/qcow2.c
32
--- a/block/qcow2.c
23
+++ b/block/qcow2.c
33
+++ b/block/qcow2.c
24
@@ -XXX,XX +XXX,XX @@ static int qcow2_set_up_encryption(BlockDriverState *bs,
34
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_do_open(BlockDriverState *bs, QDict *options,
25
* Returns: 0 on success, -errno on failure.
35
26
*/
36
bs->supported_zero_flags = header.version >= 3 ?
27
static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,
37
BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK : 0;
28
- uint64_t new_length, Error **errp)
38
+ bs->supported_truncate_flags = BDRV_REQ_ZERO_WRITE;
29
+ uint64_t new_length, PreallocMode mode,
39
30
+ Error **errp)
40
/* Repair image if dirty */
31
{
41
if (!(flags & (BDRV_O_CHECK | BDRV_O_INACTIVE)) && !bs->read_only &&
32
BDRVQcow2State *s = bs->opaque;
42
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
33
uint64_t bytes;
43
g_assert_not_reached();
34
uint64_t host_offset = 0;
44
}
35
+ int64_t file_length;
45
36
unsigned int cur_bytes;
46
+ if ((flags & BDRV_REQ_ZERO_WRITE) && offset > old_length) {
37
int ret;
47
+ uint64_t zero_start = QEMU_ALIGN_UP(old_length, s->cluster_size);
38
QCowL2Meta *meta;
39
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,
40
* all of the allocated clusters (otherwise we get failing reads after
41
* EOF). Extend the image to the last allocated sector.
42
*/
43
- if (host_offset != 0) {
44
- uint8_t data = 0;
45
- ret = bdrv_pwrite(s->data_file, (host_offset + cur_bytes) - 1,
46
- &data, 1);
47
+ file_length = bdrv_getlength(s->data_file->bs);
48
+ if (file_length < 0) {
49
+ error_setg_errno(errp, -file_length, "Could not get file size");
50
+ return file_length;
51
+ }
52
+
48
+
53
+ if (host_offset + cur_bytes > file_length) {
49
+ /*
54
+ if (mode == PREALLOC_MODE_METADATA) {
50
+ * Use zero clusters as much as we can. qcow2_cluster_zeroize()
55
+ mode = PREALLOC_MODE_OFF;
51
+ * requires a cluster-aligned start. The end may be unaligned if it is
52
+ * at the end of the image (which it is here).
53
+ */
54
+ ret = qcow2_cluster_zeroize(bs, zero_start, offset - zero_start, 0);
55
+ if (ret < 0) {
56
+ error_setg_errno(errp, -ret, "Failed to zero out new clusters");
57
+ goto fail;
56
+ }
58
+ }
57
+ ret = bdrv_co_truncate(s->data_file, host_offset + cur_bytes, mode,
59
+
58
+ errp);
60
+ /* Write explicit zeros for the unaligned head */
59
if (ret < 0) {
61
+ if (zero_start > old_length) {
60
- error_setg_errno(errp, -ret, "Writing to EOF failed");
62
+ uint64_t len = zero_start - old_length;
61
return ret;
63
+ uint8_t *buf = qemu_blockalign0(bs, len);
62
}
64
+ QEMUIOVector qiov;
63
}
65
+ qemu_iovec_init_buf(&qiov, buf, len);
64
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
66
+
65
67
+ qemu_co_mutex_unlock(&s->lock);
66
switch (prealloc) {
68
+ ret = qcow2_co_pwritev_part(bs, old_length, len, &qiov, 0, 0);
67
case PREALLOC_MODE_OFF:
69
+ qemu_co_mutex_lock(&s->lock);
68
+ if (has_data_file(bs)) {
70
+
69
+ ret = bdrv_co_truncate(s->data_file, offset, prealloc, errp);
71
+ qemu_vfree(buf);
70
+ if (ret < 0) {
72
+ if (ret < 0) {
73
+ error_setg_errno(errp, -ret, "Failed to zero out the new area");
71
+ goto fail;
74
+ goto fail;
72
+ }
75
+ }
73
+ }
76
+ }
74
break;
77
+ }
75
78
+
76
case PREALLOC_MODE_METADATA:
79
if (prealloc != PREALLOC_MODE_OFF) {
77
- ret = preallocate_co(bs, old_length, offset, errp);
80
/* Flush metadata before actually changing the image size */
78
+ ret = preallocate_co(bs, old_length, offset, prealloc, errp);
81
ret = qcow2_write_caches(bs);
79
if (ret < 0) {
80
goto fail;
81
}
82
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
83
/* With a data file, preallocation means just allocating the metadata
84
* and forwarding the truncate request to the data file */
85
if (has_data_file(bs)) {
86
- ret = preallocate_co(bs, old_length, offset, errp);
87
+ ret = preallocate_co(bs, old_length, offset, prealloc, errp);
88
if (ret < 0) {
89
goto fail;
90
}
91
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
92
93
bs->total_sectors = offset / BDRV_SECTOR_SIZE;
94
95
- if (has_data_file(bs)) {
96
- if (prealloc == PREALLOC_MODE_METADATA) {
97
- prealloc = PREALLOC_MODE_OFF;
98
- }
99
- ret = bdrv_co_truncate(s->data_file, offset, prealloc, errp);
100
- if (ret < 0) {
101
- goto fail;
102
- }
103
- }
104
-
105
/* write updated header.size */
106
offset = cpu_to_be64(offset);
107
ret = bdrv_pwrite_sync(bs->file, offsetof(QCowHeader, size),
108
--
82
--
109
2.20.1
83
2.25.3
110
84
111
85
diff view generated by jsdifflib
1
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
1
The raw format driver can simply forward the flag and let its bs->file
2
child take care of actually providing the zeros.
2
3
3
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
4
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
4
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
5
Reviewed-by: Max Reitz <mreitz@redhat.com>
5
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
6
Reviewed-by: Eric Blake <eblake@redhat.com>
7
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
8
Message-Id: <20200424125448.63318-6-kwolf@redhat.com>
6
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
9
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
7
---
10
---
8
block/stream.c | 4 +---
11
block/raw-format.c | 4 +++-
9
1 file changed, 1 insertion(+), 3 deletions(-)
12
1 file changed, 3 insertions(+), 1 deletion(-)
10
13
11
diff --git a/block/stream.c b/block/stream.c
14
diff --git a/block/raw-format.c b/block/raw-format.c
12
index XXXXXXX..XXXXXXX 100644
15
index XXXXXXX..XXXXXXX 100644
13
--- a/block/stream.c
16
--- a/block/raw-format.c
14
+++ b/block/stream.c
17
+++ b/block/raw-format.c
15
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn stream_populate(BlockBackend *blk,
18
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset,
16
int64_t offset, uint64_t bytes,
19
17
void *buf)
20
s->size = offset;
18
{
21
offset += s->offset;
19
- QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
22
- return bdrv_co_truncate(bs->file, offset, exact, prealloc, 0, errp);
20
-
23
+ return bdrv_co_truncate(bs->file, offset, exact, prealloc, flags, errp);
21
assert(bytes < SIZE_MAX);
22
23
/* Copy-on-read the unallocated clusters */
24
- return blk_co_preadv(blk, offset, qiov.size, &qiov, BDRV_REQ_COPY_ON_READ);
25
+ return blk_co_pread(blk, offset, bytes, buf, BDRV_REQ_COPY_ON_READ);
26
}
24
}
27
25
28
static void stream_abort(Job *job)
26
static void raw_eject(BlockDriverState *bs, bool eject_flag)
27
@@ -XXX,XX +XXX,XX @@ static int raw_open(BlockDriverState *bs, QDict *options, int flags,
28
bs->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED |
29
((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) &
30
bs->file->bs->supported_zero_flags);
31
+ bs->supported_truncate_flags = bs->file->bs->supported_truncate_flags &
32
+ BDRV_REQ_ZERO_WRITE;
33
34
if (bs->probed && !bdrv_is_read_only(bs)) {
35
bdrv_refresh_filename(bs->file->bs);
29
--
36
--
30
2.20.1
37
2.25.3
31
38
32
39
diff view generated by jsdifflib
1
From: Zhengui li <lizhengui@huawei.com>
1
For regular files, we always get BDRV_REQ_ZERO_WRITE behaviour from the
2
OS, so we can advertise the flag and just ignore it.
2
3
3
Concurrent IO becomes serial IO because of the qemu Coroutine lock,
4
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
4
which reduce IO performance severely.
5
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
5
6
Reviewed-by: Alberto Garcia <berto@igalia.com>
6
So unlock Coroutine lock before bdrv_co_pwritev and
7
Reviewed-by: Max Reitz <mreitz@redhat.com>
7
bdrv_co_preadv to fix it.
8
Message-Id: <20200424125448.63318-7-kwolf@redhat.com>
8
9
Signed-off-by: Zhengui li <lizhengui@huawei.com>
10
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
11
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
9
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
12
---
10
---
13
block/vpc.c | 4 ++++
11
block/file-posix.c | 4 ++++
14
1 file changed, 4 insertions(+)
12
1 file changed, 4 insertions(+)
15
13
16
diff --git a/block/vpc.c b/block/vpc.c
14
diff --git a/block/file-posix.c b/block/file-posix.c
17
index XXXXXXX..XXXXXXX 100644
15
index XXXXXXX..XXXXXXX 100644
18
--- a/block/vpc.c
16
--- a/block/file-posix.c
19
+++ b/block/vpc.c
17
+++ b/block/file-posix.c
20
@@ -XXX,XX +XXX,XX @@ vpc_co_preadv(BlockDriverState *bs, uint64_t offset, uint64_t bytes,
18
@@ -XXX,XX +XXX,XX @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
21
qemu_iovec_reset(&local_qiov);
19
#endif
22
qemu_iovec_concat(&local_qiov, qiov, bytes_done, n_bytes);
20
23
21
bs->supported_zero_flags = BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK;
24
+ qemu_co_mutex_unlock(&s->lock);
22
+ if (S_ISREG(st.st_mode)) {
25
ret = bdrv_co_preadv(bs->file, image_offset, n_bytes,
23
+ /* When extending regular files, we get zeros from the OS */
26
&local_qiov, 0);
24
+ bs->supported_truncate_flags = BDRV_REQ_ZERO_WRITE;
27
+ qemu_co_mutex_lock(&s->lock);
25
+ }
28
if (ret < 0) {
26
ret = 0;
29
goto fail;
27
fail:
30
}
28
if (filename && (bdrv_flags & BDRV_O_TEMPORARY)) {
31
@@ -XXX,XX +XXX,XX @@ vpc_co_pwritev(BlockDriverState *bs, uint64_t offset, uint64_t bytes,
32
qemu_iovec_reset(&local_qiov);
33
qemu_iovec_concat(&local_qiov, qiov, bytes_done, n_bytes);
34
35
+ qemu_co_mutex_unlock(&s->lock);
36
ret = bdrv_co_pwritev(bs->file, image_offset, n_bytes,
37
&local_qiov, 0);
38
+ qemu_co_mutex_lock(&s->lock);
39
if (ret < 0) {
40
goto fail;
41
}
42
--
29
--
43
2.20.1
30
2.25.3
44
31
45
32
diff view generated by jsdifflib
Deleted patch
1
From: Sam Eiderman <shmuel.eiderman@oracle.com>
2
1
3
Commit b69864e5a ("vmdk: Support version=3 in VMDK descriptor files")
4
fixed the probe function to correctly guess vmdk descriptors with
5
version=3.
6
7
This solves the issue where vmdk snapshot with parent vmdk descriptor
8
containing "version=3" would be treated as raw instead vmdk.
9
10
In the future case where a new vmdk version is introduced, we will again
11
experience this issue, even if the user will provide "-f vmdk" it will
12
only apply to the tip image and not to the underlying "misprobed" parent
13
image.
14
15
The code in vmdk.c already assumes that the backing file of vmdk must be
16
vmdk (see vmdk_is_cid_valid which returns 0 if backing file is not
17
vmdk).
18
19
So let's make it official by supplying the backing_format as vmdk.
20
21
Reviewed-by: Mark Kanda <mark.kanda@oracle.com>
22
Reviewed-By: Liran Alon <liran.alon@oracle.com>
23
Reviewed-by: Arbel Moshe <arbel.moshe@oracle.com>
24
Signed-off-by: Shmuel Eiderman <shmuel.eiderman@oracle.com>
25
Reviewed-by: Eric Blake <eblake@redhat.com>
26
Reviewed-by: Fam Zheng <fam@euphon.net>
27
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
28
---
29
block/vmdk.c | 2 ++
30
1 file changed, 2 insertions(+)
31
32
diff --git a/block/vmdk.c b/block/vmdk.c
33
index XXXXXXX..XXXXXXX 100644
34
--- a/block/vmdk.c
35
+++ b/block/vmdk.c
36
@@ -XXX,XX +XXX,XX @@ static int vmdk_parent_open(BlockDriverState *bs)
37
pstrcpy(bs->auto_backing_file, end_name - p_name + 1, p_name);
38
pstrcpy(bs->backing_file, sizeof(bs->backing_file),
39
bs->auto_backing_file);
40
+ pstrcpy(bs->backing_format, sizeof(bs->backing_format),
41
+ "vmdk");
42
}
43
44
out:
45
--
46
2.20.1
47
48
diff view generated by jsdifflib
Deleted patch
1
From: Stefano Garzarella <sgarzare@redhat.com>
2
1
3
IEC binary prefixes are already defined in "qemu/units.h",
4
so we can remove redundant definitions in "block/vhdx.h".
5
6
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
7
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
8
Reviewed-by: John Snow <jsnow@redhat.com>
9
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
10
---
11
block/vhdx.h | 6 +-----
12
block/vhdx.c | 3 ++-
13
2 files changed, 3 insertions(+), 6 deletions(-)
14
15
diff --git a/block/vhdx.h b/block/vhdx.h
16
index XXXXXXX..XXXXXXX 100644
17
--- a/block/vhdx.h
18
+++ b/block/vhdx.h
19
@@ -XXX,XX +XXX,XX @@
20
21
#ifndef BLOCK_VHDX_H
22
#define BLOCK_VHDX_H
23
-
24
-#define KiB (1 * 1024)
25
-#define MiB (KiB * 1024)
26
-#define GiB (MiB * 1024)
27
-#define TiB ((uint64_t) GiB * 1024)
28
+#include "qemu/units.h"
29
30
#define DEFAULT_LOG_SIZE 1048576 /* 1MiB */
31
/* Structures and fields present in the VHDX file */
32
diff --git a/block/vhdx.c b/block/vhdx.c
33
index XXXXXXX..XXXXXXX 100644
34
--- a/block/vhdx.c
35
+++ b/block/vhdx.c
36
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn vhdx_co_create(BlockdevCreateOptions *opts,
37
return -EINVAL;
38
}
39
if (block_size > VHDX_BLOCK_SIZE_MAX) {
40
- error_setg(errp, "Block size must not exceed %d", VHDX_BLOCK_SIZE_MAX);
41
+ error_setg(errp, "Block size must not exceed %" PRId64,
42
+ VHDX_BLOCK_SIZE_MAX);
43
return -EINVAL;
44
}
45
46
--
47
2.20.1
48
49
diff view generated by jsdifflib
Deleted patch
1
From: Eric Blake <eblake@redhat.com>
2
1
3
When extracting a human-readable size formatter, we changed 'uint64_t
4
div' pre-patch to 'unsigned long div' post-patch. Which breaks on
5
32-bit platforms, resulting in 'inf' instead of intended values larger
6
than 999GB.
7
8
Fixes: 22951aaa
9
CC: qemu-stable@nongnu.org
10
Reported-by: Max Reitz <mreitz@redhat.com>
11
Signed-off-by: Eric Blake <eblake@redhat.com>
12
Reviewed-by: Max Reitz <mreitz@redhat.com>
13
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
14
---
15
util/cutils.c | 2 +-
16
1 file changed, 1 insertion(+), 1 deletion(-)
17
18
diff --git a/util/cutils.c b/util/cutils.c
19
index XXXXXXX..XXXXXXX 100644
20
--- a/util/cutils.c
21
+++ b/util/cutils.c
22
@@ -XXX,XX +XXX,XX @@ const char *qemu_ether_ntoa(const MACAddr *mac)
23
char *size_to_str(uint64_t val)
24
{
25
static const char *suffixes[] = { "", "Ki", "Mi", "Gi", "Ti", "Pi", "Ei" };
26
- unsigned long div;
27
+ uint64_t div;
28
int i;
29
30
/*
31
--
32
2.20.1
33
34
diff view generated by jsdifflib
Deleted patch
1
From: Eric Blake <eblake@redhat.com>
2
1
3
Disk sizes close to INT64_MAX cause overflow, for some pretty
4
ridiculous output:
5
6
$ ./nbdkit -U - memory size=$((2**63 - 512)) --run 'qemu-img info $nbd'
7
image: nbd+unix://?socket=/tmp/nbdkitHSAzNz/socket
8
file format: raw
9
virtual size: -8388607T (9223372036854775296 bytes)
10
disk size: unavailable
11
12
But there's no reason to have two separate implementations of integer
13
to human-readable abbreviation, where one has overflow and stops at
14
'T', while the other avoids overflow and goes all the way to 'E'. With
15
this patch, the output now claims 8EiB instead of -8388607T, which
16
really is the correct rounding of largest file size supported by qemu
17
(we could go 511 bytes larger if we used byte-accurate sizing instead
18
of rounding up to the next sector boundary, but that wouldn't change
19
the human-readable result).
20
21
Quite a few iotests need updates to expected output to match.
22
23
Reported-by: Richard W.M. Jones <rjones@redhat.com>
24
Signed-off-by: Eric Blake <eblake@redhat.com>
25
Tested-by: Richard W.M. Jones <rjones@redhat.com>
26
Reviewed-by: Alberto Garcia <berto@igalia.com>
27
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
28
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
29
Tested-by: Max Reitz <mreitz@redhat.com>
30
---
31
block/qapi.c | 49 +++++++++-----------------------------
32
tests/qemu-iotests/043.out | 6 ++---
33
tests/qemu-iotests/053.out | 2 +-
34
tests/qemu-iotests/059.out | 10 ++++----
35
tests/qemu-iotests/060.out | 10 ++++----
36
tests/qemu-iotests/061.out | 12 +++++-----
37
tests/qemu-iotests/070.out | 2 +-
38
tests/qemu-iotests/082.out | 26 ++++++++++----------
39
tests/qemu-iotests/084.out | 8 +++----
40
tests/qemu-iotests/089.out | 2 +-
41
tests/qemu-iotests/095.out | 4 ++--
42
tests/qemu-iotests/104.out | 6 ++---
43
tests/qemu-iotests/110.out | 6 ++---
44
tests/qemu-iotests/114.out | 2 +-
45
tests/qemu-iotests/126.out | 4 ++--
46
tests/qemu-iotests/130.out | 10 ++++----
47
tests/qemu-iotests/153.out | 2 +-
48
tests/qemu-iotests/191.out | 8 +++----
49
tests/qemu-iotests/195.out | 4 ++--
50
tests/qemu-iotests/198.out | 4 ++--
51
tests/qemu-iotests/206.out | 10 ++++----
52
tests/qemu-iotests/207.out | 12 +++++-----
53
tests/qemu-iotests/210.out | 8 +++----
54
tests/qemu-iotests/211.out | 10 ++++----
55
tests/qemu-iotests/212.out | 10 ++++----
56
tests/qemu-iotests/213.out | 10 ++++----
57
tests/qemu-iotests/233.out | 4 ++--
58
tests/qemu-iotests/237.out | 22 ++++++++---------
59
tests/qemu-iotests/242.out | 10 ++++----
60
29 files changed, 123 insertions(+), 150 deletions(-)
61
62
diff --git a/block/qapi.c b/block/qapi.c
63
index XXXXXXX..XXXXXXX 100644
64
--- a/block/qapi.c
65
+++ b/block/qapi.c
66
@@ -XXX,XX +XXX,XX @@ BlockStatsList *qmp_query_blockstats(bool has_query_nodes,
67
return head;
68
}
69
70
-#define NB_SUFFIXES 4
71
-
72
-static char *get_human_readable_size(char *buf, int buf_size, int64_t size)
73
-{
74
- static const char suffixes[NB_SUFFIXES] = {'K', 'M', 'G', 'T'};
75
- int64_t base;
76
- int i;
77
-
78
- if (size <= 999) {
79
- snprintf(buf, buf_size, "%" PRId64, size);
80
- } else {
81
- base = 1024;
82
- for (i = 0; i < NB_SUFFIXES; i++) {
83
- if (size < (10 * base)) {
84
- snprintf(buf, buf_size, "%0.1f%c",
85
- (double)size / base,
86
- suffixes[i]);
87
- break;
88
- } else if (size < (1000 * base) || i == (NB_SUFFIXES - 1)) {
89
- snprintf(buf, buf_size, "%" PRId64 "%c",
90
- ((size + (base >> 1)) / base),
91
- suffixes[i]);
92
- break;
93
- }
94
- base = base * 1024;
95
- }
96
- }
97
- return buf;
98
-}
99
-
100
void bdrv_snapshot_dump(QEMUSnapshotInfo *sn)
101
{
102
- char buf1[128], date_buf[128], clock_buf[128];
103
+ char date_buf[128], clock_buf[128];
104
struct tm tm;
105
time_t ti;
106
int64_t secs;
107
+ char *sizing = NULL;
108
109
if (!sn) {
110
qemu_printf("%-10s%-20s%7s%20s%15s",
111
@@ -XXX,XX +XXX,XX @@ void bdrv_snapshot_dump(QEMUSnapshotInfo *sn)
112
(int)((secs / 60) % 60),
113
(int)(secs % 60),
114
(int)((sn->vm_clock_nsec / 1000000) % 1000));
115
+ sizing = size_to_str(sn->vm_state_size);
116
qemu_printf("%-10s%-20s%7s%20s%15s",
117
sn->id_str, sn->name,
118
- get_human_readable_size(buf1, sizeof(buf1),
119
- sn->vm_state_size),
120
+ sizing,
121
date_buf,
122
clock_buf);
123
}
124
+ g_free(sizing);
125
}
126
127
static void dump_qdict(int indentation, QDict *dict);
128
@@ -XXX,XX +XXX,XX @@ void bdrv_image_info_specific_dump(ImageInfoSpecific *info_spec)
129
130
void bdrv_image_info_dump(ImageInfo *info)
131
{
132
- char size_buf[128], dsize_buf[128];
133
+ char *size_buf, *dsize_buf;
134
if (!info->has_actual_size) {
135
- snprintf(dsize_buf, sizeof(dsize_buf), "unavailable");
136
+ dsize_buf = g_strdup("unavailable");
137
} else {
138
- get_human_readable_size(dsize_buf, sizeof(dsize_buf),
139
- info->actual_size);
140
+ dsize_buf = size_to_str(info->actual_size);
141
}
142
- get_human_readable_size(size_buf, sizeof(size_buf), info->virtual_size);
143
+ size_buf = size_to_str(info->virtual_size);
144
qemu_printf("image: %s\n"
145
"file format: %s\n"
146
"virtual size: %s (%" PRId64 " bytes)\n"
147
@@ -XXX,XX +XXX,XX @@ void bdrv_image_info_dump(ImageInfo *info)
148
info->filename, info->format, size_buf,
149
info->virtual_size,
150
dsize_buf);
151
+ g_free(size_buf);
152
+ g_free(dsize_buf);
153
154
if (info->has_encrypted && info->encrypted) {
155
qemu_printf("encrypted: yes\n");
156
diff --git a/tests/qemu-iotests/043.out b/tests/qemu-iotests/043.out
157
index XXXXXXX..XXXXXXX 100644
158
--- a/tests/qemu-iotests/043.out
159
+++ b/tests/qemu-iotests/043.out
160
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/
161
== finite chain of length 3 (human) ==
162
image: TEST_DIR/t.IMGFMT
163
file format: IMGFMT
164
-virtual size: 128M (134217728 bytes)
165
+virtual size: 128 MiB (134217728 bytes)
166
cluster_size: 65536
167
backing file: TEST_DIR/t.IMGFMT.2.base
168
169
image: TEST_DIR/t.IMGFMT.2.base
170
file format: IMGFMT
171
-virtual size: 128M (134217728 bytes)
172
+virtual size: 128 MiB (134217728 bytes)
173
cluster_size: 65536
174
backing file: TEST_DIR/t.IMGFMT.1.base
175
176
image: TEST_DIR/t.IMGFMT.1.base
177
file format: IMGFMT
178
-virtual size: 128M (134217728 bytes)
179
+virtual size: 128 MiB (134217728 bytes)
180
cluster_size: 65536
181
182
== finite chain of length 3 (json) ==
183
diff --git a/tests/qemu-iotests/053.out b/tests/qemu-iotests/053.out
184
index XXXXXXX..XXXXXXX 100644
185
--- a/tests/qemu-iotests/053.out
186
+++ b/tests/qemu-iotests/053.out
187
@@ -XXX,XX +XXX,XX @@ wrote 512/512 bytes at offset 0
188
No errors were found on the image.
189
190
== Checking compressed image virtual disk size ==
191
-virtual size: 512 (512 bytes)
192
+virtual size: 512 B (512 bytes)
193
194
== Verifying the compressed image ==
195
read 512/512 bytes at offset 0
196
diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out
197
index XXXXXXX..XXXXXXX 100644
198
--- a/tests/qemu-iotests/059.out
199
+++ b/tests/qemu-iotests/059.out
200
@@ -XXX,XX +XXX,XX @@ can't open device TEST_DIR/t.vmdk: L1 size too big
201
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648 subformat=monolithicFlat
202
image: TEST_DIR/t.IMGFMT
203
file format: IMGFMT
204
-virtual size: 2.0G (2147483648 bytes)
205
+virtual size: 2 GiB (2147483648 bytes)
206
207
=== Testing monolithicFlat with zeroed_grain ===
208
qemu-img: TEST_DIR/t.IMGFMT: Flat image can't enable zeroed grain
209
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648 subformat=monolithicF
210
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824000 subformat=twoGbMaxExtentFlat
211
image: TEST_DIR/t.vmdk
212
file format: vmdk
213
-virtual size: 1.0T (1073741824000 bytes)
214
-disk size: 16K
215
+virtual size: 0.977 TiB (1073741824000 bytes)
216
+disk size: 16 KiB
217
Format specific information:
218
cid: XXXXXXXX
219
parent cid: XXXXXXXX
220
@@ -XXX,XX +XXX,XX @@ can't open: Cannot use relative extent paths with VMDK descriptor file 'json:{"i
221
=== Testing version 3 ===
222
image: TEST_DIR/iotest-version3.IMGFMT
223
file format: IMGFMT
224
-virtual size: 16G (17179869184 bytes)
225
+virtual size: 16 GiB (17179869184 bytes)
226
cluster_size: 65536
227
read 512/512 bytes at offset 0
228
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
229
@@ -XXX,XX +XXX,XX @@ read 512/512 bytes at offset 64931328
230
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4398046511104 subformat=monolithicFlat
231
image: TEST_DIR/t.IMGFMT
232
file format: IMGFMT
233
-virtual size: 4.0T (4398046511104 bytes)
234
+virtual size: 4 TiB (4398046511104 bytes)
235
wrote 512/512 bytes at offset 966367641600
236
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
237
e100000000: 0a 0a 0a 0a 0a 0a 0a 0a 0a 0a 0a 0a 0a 0a 0a 0a ................
238
diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out
239
index XXXXXXX..XXXXXXX 100644
240
--- a/tests/qemu-iotests/060.out
241
+++ b/tests/qemu-iotests/060.out
242
@@ -XXX,XX +XXX,XX @@ write failed: Input/output error
243
incompatible_features 0x2
244
image: TEST_DIR/t.IMGFMT
245
file format: IMGFMT
246
-virtual size: 64M (67108864 bytes)
247
+virtual size: 64 MiB (67108864 bytes)
248
cluster_size: 65536
249
Format specific information:
250
compat: 1.1
251
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
252
qcow2: Marking image as corrupt: Refblock at 0xffffff00000000 is not covered by the refcount structures; further corruption events will be suppressed
253
qemu-img: Failed to discard unused refblocks: Input/output error
254
--- Checking and retrying ---
255
-virtual size: 64M (67108864 bytes)
256
+virtual size: 64 MiB (67108864 bytes)
257
No errors were found on the image.
258
Image resized.
259
-virtual size: 32M (33554432 bytes)
260
+virtual size: 32 MiB (33554432 bytes)
261
262
=== Discarding a non-covered in-bounds refblock ===
263
264
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
265
qcow2: Marking image as corrupt: Refblock at 0x1000000000 is not covered by the refcount structures; further corruption events will be suppressed
266
qemu-img: Failed to discard unused refblocks: Input/output error
267
--- Checking and retrying ---
268
-virtual size: 64M (67108864 bytes)
269
+virtual size: 64 MiB (67108864 bytes)
270
No errors were found on the image.
271
Image resized.
272
-virtual size: 32M (33554432 bytes)
273
+virtual size: 32 MiB (33554432 bytes)
274
275
=== Discarding a refblock covered by an unaligned refblock ===
276
277
diff --git a/tests/qemu-iotests/061.out b/tests/qemu-iotests/061.out
278
index XXXXXXX..XXXXXXX 100644
279
--- a/tests/qemu-iotests/061.out
280
+++ b/tests/qemu-iotests/061.out
281
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 data_file=TEST_DIR/t.IM
282
qemu-img: Cannot downgrade an image with a data file
283
image: TEST_DIR/t.IMGFMT
284
file format: IMGFMT
285
-virtual size: 64M (67108864 bytes)
286
+virtual size: 64 MiB (67108864 bytes)
287
cluster_size: 65536
288
Format specific information:
289
compat: 1.1
290
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 data_file=TEST_DIR/t.IM
291
qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Could not open 'foo': No such file or directory
292
image: TEST_DIR/t.IMGFMT
293
file format: IMGFMT
294
-virtual size: 64M (67108864 bytes)
295
+virtual size: 64 MiB (67108864 bytes)
296
cluster_size: 65536
297
Format specific information:
298
compat: 1.1
299
@@ -XXX,XX +XXX,XX @@ Format specific information:
300
qemu-img: Could not open 'TEST_DIR/t.IMGFMT': 'data-file' is required for this image
301
image: TEST_DIR/t.IMGFMT
302
file format: IMGFMT
303
-virtual size: 64M (67108864 bytes)
304
+virtual size: 64 MiB (67108864 bytes)
305
cluster_size: 65536
306
Format specific information:
307
compat: 1.1
308
@@ -XXX,XX +XXX,XX @@ Format specific information:
309
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 data_file=TEST_DIR/t.IMGFMT.data data_file_raw=on
310
image: TEST_DIR/t.IMGFMT
311
file format: IMGFMT
312
-virtual size: 64M (67108864 bytes)
313
+virtual size: 64 MiB (67108864 bytes)
314
cluster_size: 65536
315
Format specific information:
316
compat: 1.1
317
@@ -XXX,XX +XXX,XX @@ Format specific information:
318
No errors were found on the image.
319
image: TEST_DIR/t.IMGFMT
320
file format: IMGFMT
321
-virtual size: 64M (67108864 bytes)
322
+virtual size: 64 MiB (67108864 bytes)
323
cluster_size: 65536
324
Format specific information:
325
compat: 1.1
326
@@ -XXX,XX +XXX,XX @@ No errors were found on the image.
327
qemu-img: data-file-raw cannot be set on existing images
328
image: TEST_DIR/t.IMGFMT
329
file format: IMGFMT
330
-virtual size: 64M (67108864 bytes)
331
+virtual size: 64 MiB (67108864 bytes)
332
cluster_size: 65536
333
Format specific information:
334
compat: 1.1
335
diff --git a/tests/qemu-iotests/070.out b/tests/qemu-iotests/070.out
336
index XXXXXXX..XXXXXXX 100644
337
--- a/tests/qemu-iotests/070.out
338
+++ b/tests/qemu-iotests/070.out
339
@@ -XXX,XX +XXX,XX @@ read 18874368/18874368 bytes at offset 0
340
=== Verify image created by Disk2VHD can be opened ===
341
image: TEST_DIR/test-disk2vhd.IMGFMT
342
file format: IMGFMT
343
-virtual size: 256M (268435456 bytes)
344
+virtual size: 256 MiB (268435456 bytes)
345
cluster_size: 2097152
346
*** done
347
diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out
348
index XXXXXXX..XXXXXXX 100644
349
--- a/tests/qemu-iotests/082.out
350
+++ b/tests/qemu-iotests/082.out
351
@@ -XXX,XX +XXX,XX @@ Testing: create -f foo -f qcow2 TEST_DIR/t.qcow2 128M
352
Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 cluster_size=65536 lazy_refcounts=off refcount_bits=16
353
image: TEST_DIR/t.IMGFMT
354
file format: IMGFMT
355
-virtual size: 128M (134217728 bytes)
356
+virtual size: 128 MiB (134217728 bytes)
357
cluster_size: 65536
358
359
Testing: create -f qcow2 -o cluster_size=4k -o lazy_refcounts=on TEST_DIR/t.qcow2 128M
360
Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 cluster_size=4096 lazy_refcounts=on refcount_bits=16
361
image: TEST_DIR/t.IMGFMT
362
file format: IMGFMT
363
-virtual size: 128M (134217728 bytes)
364
+virtual size: 128 MiB (134217728 bytes)
365
cluster_size: 4096
366
Format specific information:
367
compat: 1.1
368
@@ -XXX,XX +XXX,XX @@ Testing: create -f qcow2 -o cluster_size=4k -o lazy_refcounts=on -o cluster_size
369
Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 cluster_size=8192 lazy_refcounts=on refcount_bits=16
370
image: TEST_DIR/t.IMGFMT
371
file format: IMGFMT
372
-virtual size: 128M (134217728 bytes)
373
+virtual size: 128 MiB (134217728 bytes)
374
cluster_size: 8192
375
Format specific information:
376
compat: 1.1
377
@@ -XXX,XX +XXX,XX @@ Testing: create -f qcow2 -o cluster_size=4k,cluster_size=8k TEST_DIR/t.qcow2 128
378
Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 cluster_size=8192 lazy_refcounts=off refcount_bits=16
379
image: TEST_DIR/t.IMGFMT
380
file format: IMGFMT
381
-virtual size: 128M (134217728 bytes)
382
+virtual size: 128 MiB (134217728 bytes)
383
cluster_size: 8192
384
385
=== create: help for -o ===
386
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=134217728 cluster_size=65536 lazy_
387
Testing: convert -f foo -f qcow2 TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
388
image: TEST_DIR/t.IMGFMT.base
389
file format: raw
390
-virtual size: 128M (134217728 bytes)
391
+virtual size: 128 MiB (134217728 bytes)
392
393
Testing: convert -O foo -O qcow2 TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
394
image: TEST_DIR/t.IMGFMT.base
395
file format: IMGFMT
396
-virtual size: 128M (134217728 bytes)
397
+virtual size: 128 MiB (134217728 bytes)
398
cluster_size: 65536
399
400
Testing: convert -O qcow2 -o cluster_size=4k -o lazy_refcounts=on TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
401
image: TEST_DIR/t.IMGFMT.base
402
file format: IMGFMT
403
-virtual size: 128M (134217728 bytes)
404
+virtual size: 128 MiB (134217728 bytes)
405
cluster_size: 4096
406
Format specific information:
407
compat: 1.1
408
@@ -XXX,XX +XXX,XX @@ Format specific information:
409
Testing: convert -O qcow2 -o cluster_size=4k -o lazy_refcounts=on -o cluster_size=8k TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
410
image: TEST_DIR/t.IMGFMT.base
411
file format: IMGFMT
412
-virtual size: 128M (134217728 bytes)
413
+virtual size: 128 MiB (134217728 bytes)
414
cluster_size: 8192
415
Format specific information:
416
compat: 1.1
417
@@ -XXX,XX +XXX,XX @@ Format specific information:
418
Testing: convert -O qcow2 -o cluster_size=4k,cluster_size=8k TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base
419
image: TEST_DIR/t.IMGFMT.base
420
file format: IMGFMT
421
-virtual size: 128M (134217728 bytes)
422
+virtual size: 128 MiB (134217728 bytes)
423
cluster_size: 8192
424
425
=== convert: help for -o ===
426
@@ -XXX,XX +XXX,XX @@ qemu-img: Cannot enable copy offloading when -c is used
427
Testing: amend -f foo -f qcow2 -o lazy_refcounts=on TEST_DIR/t.qcow2
428
image: TEST_DIR/t.IMGFMT
429
file format: IMGFMT
430
-virtual size: 128M (134217728 bytes)
431
+virtual size: 128 MiB (134217728 bytes)
432
cluster_size: 65536
433
Format specific information:
434
compat: 1.1
435
@@ -XXX,XX +XXX,XX @@ Format specific information:
436
Testing: amend -f qcow2 -o size=130M -o lazy_refcounts=off TEST_DIR/t.qcow2
437
image: TEST_DIR/t.IMGFMT
438
file format: IMGFMT
439
-virtual size: 130M (136314880 bytes)
440
+virtual size: 130 MiB (136314880 bytes)
441
cluster_size: 65536
442
Format specific information:
443
compat: 1.1
444
@@ -XXX,XX +XXX,XX @@ Format specific information:
445
Testing: amend -f qcow2 -o size=8M -o lazy_refcounts=on -o size=132M TEST_DIR/t.qcow2
446
image: TEST_DIR/t.IMGFMT
447
file format: IMGFMT
448
-virtual size: 132M (138412032 bytes)
449
+virtual size: 132 MiB (138412032 bytes)
450
cluster_size: 65536
451
Format specific information:
452
compat: 1.1
453
@@ -XXX,XX +XXX,XX @@ Format specific information:
454
Testing: amend -f qcow2 -o size=4M,size=148M TEST_DIR/t.qcow2
455
image: TEST_DIR/t.IMGFMT
456
file format: IMGFMT
457
-virtual size: 148M (155189248 bytes)
458
+virtual size: 148 MiB (155189248 bytes)
459
cluster_size: 65536
460
461
=== amend: help for -o ===
462
diff --git a/tests/qemu-iotests/084.out b/tests/qemu-iotests/084.out
463
index XXXXXXX..XXXXXXX 100644
464
--- a/tests/qemu-iotests/084.out
465
+++ b/tests/qemu-iotests/084.out
466
@@ -XXX,XX +XXX,XX @@ QA output created by 084
467
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
468
image: TEST_DIR/t.IMGFMT
469
file format: IMGFMT
470
-virtual size: 64M (67108864 bytes)
471
+virtual size: 64 MiB (67108864 bytes)
472
cluster_size: 1048576
473
disk image file size in bytes: 67109888
474
475
@@ -XXX,XX +XXX,XX @@ disk image file size in bytes: 67109888
476
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
477
image: TEST_DIR/t.IMGFMT
478
file format: IMGFMT
479
-virtual size: 64M (67108864 bytes)
480
+virtual size: 64 MiB (67108864 bytes)
481
cluster_size: 1048576
482
disk image file size in bytes: 1024
483
Test 1: Maximum size (512 TB - 128 MB):
484
image: TEST_DIR/t.IMGFMT
485
file format: IMGFMT
486
-virtual size: 512T (562949819203584 bytes)
487
+virtual size: 512 TiB (562949819203584 bytes)
488
cluster_size: 1048576
489
490
Test 2: Size too large (512 TB - 128 MB + 64 kB)
491
@@ -XXX,XX +XXX,XX @@ qemu-img: Could not open 'TEST_DIR/t.IMGFMT': unsupported VDI image (too many bl
492
Test 5: Valid Image: 64MB, Blocks In Image 64, Block Size 1MB
493
image: TEST_DIR/t.IMGFMT
494
file format: IMGFMT
495
-virtual size: 64M (67108864 bytes)
496
+virtual size: 64 MiB (67108864 bytes)
497
cluster_size: 1048576
498
499
Test 6: Block Size != 1MB; too small test (1MB - 1)
500
diff --git a/tests/qemu-iotests/089.out b/tests/qemu-iotests/089.out
501
index XXXXXXX..XXXXXXX 100644
502
--- a/tests/qemu-iotests/089.out
503
+++ b/tests/qemu-iotests/089.out
504
@@ -XXX,XX +XXX,XX @@ read failed: Input/output error
505
506
image: TEST_DIR/t.IMGFMT
507
file format: IMGFMT
508
-virtual size: 64M (67108864 bytes)
509
+virtual size: 64 MiB (67108864 bytes)
510
cluster_size: 65536
511
512
=== Testing option merging ===
513
diff --git a/tests/qemu-iotests/095.out b/tests/qemu-iotests/095.out
514
index XXXXXXX..XXXXXXX 100644
515
--- a/tests/qemu-iotests/095.out
516
+++ b/tests/qemu-iotests/095.out
517
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=104857600 backing_file=TEST_DIR/
518
=== Base image info before commit and resize ===
519
image: TEST_DIR/t.IMGFMT.base
520
file format: IMGFMT
521
-virtual size: 5.0M (5242880 bytes)
522
+virtual size: 5 MiB (5242880 bytes)
523
524
=== Running QEMU Live Commit Test ===
525
526
@@ -XXX,XX +XXX,XX @@ virtual size: 5.0M (5242880 bytes)
527
=== Base image info after commit and resize ===
528
image: TEST_DIR/t.IMGFMT.base
529
file format: IMGFMT
530
-virtual size: 100M (104857600 bytes)
531
+virtual size: 100 MiB (104857600 bytes)
532
*** done
533
diff --git a/tests/qemu-iotests/104.out b/tests/qemu-iotests/104.out
534
index XXXXXXX..XXXXXXX 100644
535
--- a/tests/qemu-iotests/104.out
536
+++ b/tests/qemu-iotests/104.out
537
@@ -XXX,XX +XXX,XX @@ QA output created by 104
538
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1024
539
image: TEST_DIR/t.IMGFMT
540
file format: IMGFMT
541
-virtual size: 1.0K (1024 bytes)
542
+virtual size: 1 KiB (1024 bytes)
543
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1234
544
image: TEST_DIR/t.IMGFMT
545
file format: IMGFMT
546
-virtual size: 1.5K (1536 bytes)
547
-***done
548
+virtual size: 1.5 KiB (1536 bytes)
549
+*** done
550
diff --git a/tests/qemu-iotests/110.out b/tests/qemu-iotests/110.out
551
index XXXXXXX..XXXXXXX 100644
552
--- a/tests/qemu-iotests/110.out
553
+++ b/tests/qemu-iotests/110.out
554
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864
555
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=t.IMGFMT.base
556
image: TEST_DIR/t.IMGFMT
557
file format: IMGFMT
558
-virtual size: 64M (67108864 bytes)
559
+virtual size: 64 MiB (67108864 bytes)
560
backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base)
561
562
=== Non-reconstructable filename ===
563
564
image: json:{"driver": "IMGFMT", "file": {"set-state.0.event": "read_aio", "image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "driver": "blkdebug", "set-state.0.new_state": 42}}
565
file format: IMGFMT
566
-virtual size: 64M (67108864 bytes)
567
+virtual size: 64 MiB (67108864 bytes)
568
backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base)
569
570
=== Backing name is always relative to the backed image ===
571
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=t.IMGFMT.b
572
573
image: json:{"driver": "IMGFMT", "file": {"children": [{"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, {"driver": "file", "filename": "TEST_DIR/t.IMGFMT.copy"}], "driver": "quorum", "vote-threshold": 1}}
574
file format: IMGFMT
575
-virtual size: 64M (67108864 bytes)
576
+virtual size: 64 MiB (67108864 bytes)
577
backing file: t.IMGFMT.base (cannot determine actual path)
578
*** done
579
diff --git a/tests/qemu-iotests/114.out b/tests/qemu-iotests/114.out
580
index XXXXXXX..XXXXXXX 100644
581
--- a/tests/qemu-iotests/114.out
582
+++ b/tests/qemu-iotests/114.out
583
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864
584
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.base
585
image: TEST_DIR/t.IMGFMT
586
file format: IMGFMT
587
-virtual size: 64M (67108864 bytes)
588
+virtual size: 64 MiB (67108864 bytes)
589
cluster_size: 65536
590
backing file: TEST_DIR/t.IMGFMT.base
591
backing file format: foo
592
diff --git a/tests/qemu-iotests/126.out b/tests/qemu-iotests/126.out
593
index XXXXXXX..XXXXXXX 100644
594
--- a/tests/qemu-iotests/126.out
595
+++ b/tests/qemu-iotests/126.out
596
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/image:base.IMGFMT', fmt=IMGFMT size=67108864
597
Formatting 'TEST_DIR/image:top.IMGFMT', fmt=IMGFMT size=67108864 backing_file=./image:base.IMGFMT
598
image: TEST_DIR/image:top.IMGFMT
599
file format: IMGFMT
600
-virtual size: 64M (67108864 bytes)
601
+virtual size: 64 MiB (67108864 bytes)
602
backing file: ./image:base.IMGFMT (actual path: TEST_DIR/./image:base.IMGFMT)
603
604
Formatting 'base.IMGFMT', fmt=IMGFMT size=67108864
605
Formatting 'file:image:top.IMGFMT', fmt=IMGFMT size=67108864 backing_file=base.IMGFMT
606
image: ./image:top.IMGFMT
607
file format: IMGFMT
608
-virtual size: 64M (67108864 bytes)
609
+virtual size: 64 MiB (67108864 bytes)
610
backing file: base.IMGFMT (actual path: ./base.IMGFMT)
611
*** done
612
diff --git a/tests/qemu-iotests/130.out b/tests/qemu-iotests/130.out
613
index XXXXXXX..XXXXXXX 100644
614
--- a/tests/qemu-iotests/130.out
615
+++ b/tests/qemu-iotests/130.out
616
@@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864
617
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
618
image: TEST_DIR/t.IMGFMT
619
file format: IMGFMT
620
-virtual size: 64M (67108864 bytes)
621
+virtual size: 64 MiB (67108864 bytes)
622
623
=== HMP commit ===
624
625
@@ -XXX,XX +XXX,XX @@ QEMU X.Y.Z monitor - type 'help' for more information
626
(qemu)
627
image: TEST_DIR/t.IMGFMT
628
file format: IMGFMT
629
-virtual size: 64M (67108864 bytes)
630
+virtual size: 64 MiB (67108864 bytes)
631
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.orig backing_fmt=raw
632
QEMU X.Y.Z monitor - type 'help' for more information
633
(qemu) commit testdisk
634
(qemu)
635
image: TEST_DIR/t.IMGFMT
636
file format: IMGFMT
637
-virtual size: 64M (67108864 bytes)
638
+virtual size: 64 MiB (67108864 bytes)
639
backing file: TEST_DIR/t.IMGFMT.orig
640
backing file format: raw
641
642
@@ -XXX,XX +XXX,XX @@ wrote 4096/4096 bytes at offset 0
643
4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
644
image: TEST_DIR/t.IMGFMT
645
file format: IMGFMT
646
-virtual size: 64M (67108864 bytes)
647
+virtual size: 64 MiB (67108864 bytes)
648
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.orig backing_fmt=raw
649
wrote 4096/4096 bytes at offset 0
650
4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
651
image: TEST_DIR/t.IMGFMT
652
file format: IMGFMT
653
-virtual size: 64M (67108864 bytes)
654
+virtual size: 64 MiB (67108864 bytes)
655
backing file: TEST_DIR/t.IMGFMT.orig
656
backing file format: raw
657
*** done
658
diff --git a/tests/qemu-iotests/153.out b/tests/qemu-iotests/153.out
659
index XXXXXXX..XXXXXXX 100644
660
--- a/tests/qemu-iotests/153.out
661
+++ b/tests/qemu-iotests/153.out
662
@@ -XXX,XX +XXX,XX @@ _qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512
663
No conflict:
664
image: null-co://
665
file format: null-co
666
-virtual size: 1.0G (1073741824 bytes)
667
+virtual size: 1 GiB (1073741824 bytes)
668
disk size: unavailable
669
670
Conflict:
671
diff --git a/tests/qemu-iotests/191.out b/tests/qemu-iotests/191.out
672
index XXXXXXX..XXXXXXX 100644
673
--- a/tests/qemu-iotests/191.out
674
+++ b/tests/qemu-iotests/191.out
675
@@ -XXX,XX +XXX,XX @@ wrote 65536/65536 bytes at offset 1048576
676
}
677
image: TEST_DIR/t.IMGFMT
678
file format: IMGFMT
679
-virtual size: 64M (67108864 bytes)
680
+virtual size: 64 MiB (67108864 bytes)
681
cluster_size: 65536
682
backing file: TEST_DIR/t.IMGFMT.base
683
backing file format: IMGFMT
684
image: TEST_DIR/t.IMGFMT.ovl2
685
file format: IMGFMT
686
-virtual size: 64M (67108864 bytes)
687
+virtual size: 64 MiB (67108864 bytes)
688
cluster_size: 65536
689
backing file: TEST_DIR/t.IMGFMT.base
690
backing file format: IMGFMT
691
@@ -XXX,XX +XXX,XX @@ wrote 65536/65536 bytes at offset 1048576
692
}
693
image: TEST_DIR/t.IMGFMT
694
file format: IMGFMT
695
-virtual size: 64M (67108864 bytes)
696
+virtual size: 64 MiB (67108864 bytes)
697
cluster_size: 65536
698
backing file: TEST_DIR/t.IMGFMT.base
699
backing file format: IMGFMT
700
image: TEST_DIR/t.IMGFMT.ovl2
701
file format: IMGFMT
702
-virtual size: 64M (67108864 bytes)
703
+virtual size: 64 MiB (67108864 bytes)
704
cluster_size: 65536
705
backing file: TEST_DIR/t.IMGFMT.base
706
backing file format: IMGFMT
707
diff --git a/tests/qemu-iotests/195.out b/tests/qemu-iotests/195.out
708
index XXXXXXX..XXXXXXX 100644
709
--- a/tests/qemu-iotests/195.out
710
+++ b/tests/qemu-iotests/195.out
711
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.IMGFMT,backing.node-name=mid
712
713
image: TEST_DIR/t.IMGFMT.mid
714
file format: IMGFMT
715
-virtual size: 64M (67108864 bytes)
716
+virtual size: 64 MiB (67108864 bytes)
717
cluster_size: 65536
718
backing file: /dev/null
719
backing file format: IMGFMT
720
@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,file=TEST_DIR/t.IMGFMT,node-name=top
721
722
image: TEST_DIR/t.IMGFMT
723
file format: IMGFMT
724
-virtual size: 64M (67108864 bytes)
725
+virtual size: 64 MiB (67108864 bytes)
726
cluster_size: 65536
727
backing file: /dev/null
728
backing file format: IMGFMT
729
diff --git a/tests/qemu-iotests/198.out b/tests/qemu-iotests/198.out
730
index XXXXXXX..XXXXXXX 100644
731
--- a/tests/qemu-iotests/198.out
732
+++ b/tests/qemu-iotests/198.out
733
@@ -XXX,XX +XXX,XX @@ read 16777216/16777216 bytes at offset 0
734
== checking image base ==
735
image: json:{"encrypt.key-secret": "sec0", "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT.base"}}
736
file format: IMGFMT
737
-virtual size: 16M (16777216 bytes)
738
+virtual size: 16 MiB (16777216 bytes)
739
Format specific information:
740
encrypt:
741
ivgen alg: plain64
742
@@ -XXX,XX +XXX,XX @@ Format specific information:
743
== checking image layer ==
744
image: json:{"encrypt.key-secret": "sec1", "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}}
745
file format: IMGFMT
746
-virtual size: 16M (16777216 bytes)
747
+virtual size: 16 MiB (16777216 bytes)
748
backing file: TEST_DIR/t.IMGFMT.base
749
Format specific information:
750
encrypt:
751
diff --git a/tests/qemu-iotests/206.out b/tests/qemu-iotests/206.out
752
index XXXXXXX..XXXXXXX 100644
753
--- a/tests/qemu-iotests/206.out
754
+++ b/tests/qemu-iotests/206.out
755
@@ -XXX,XX +XXX,XX @@
756
757
image: TEST_IMG
758
file format: IMGFMT
759
-virtual size: 128M (134217728 bytes)
760
+virtual size: 128 MiB (134217728 bytes)
761
cluster_size: 65536
762
Format specific information:
763
compat: 1.1
764
@@ -XXX,XX +XXX,XX @@ Format specific information:
765
766
image: TEST_IMG
767
file format: IMGFMT
768
-virtual size: 64M (67108864 bytes)
769
+virtual size: 64 MiB (67108864 bytes)
770
cluster_size: 65536
771
Format specific information:
772
compat: 1.1
773
@@ -XXX,XX +XXX,XX @@ Format specific information:
774
775
image: TEST_IMG
776
file format: IMGFMT
777
-virtual size: 32M (33554432 bytes)
778
+virtual size: 32 MiB (33554432 bytes)
779
cluster_size: 2097152
780
Format specific information:
781
compat: 1.1
782
@@ -XXX,XX +XXX,XX @@ Format specific information:
783
784
image: TEST_IMG
785
file format: IMGFMT
786
-virtual size: 32M (33554432 bytes)
787
+virtual size: 32 MiB (33554432 bytes)
788
cluster_size: 512
789
backing file: TEST_IMG.base
790
backing file format: IMGFMT
791
@@ -XXX,XX +XXX,XX @@ Format specific information:
792
793
image: TEST_IMG
794
file format: IMGFMT
795
-virtual size: 32M (33554432 bytes)
796
+virtual size: 32 MiB (33554432 bytes)
797
encrypted: yes
798
cluster_size: 65536
799
Format specific information:
800
diff --git a/tests/qemu-iotests/207.out b/tests/qemu-iotests/207.out
801
index XXXXXXX..XXXXXXX 100644
802
--- a/tests/qemu-iotests/207.out
803
+++ b/tests/qemu-iotests/207.out
804
@@ -XXX,XX +XXX,XX @@
805
806
image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}
807
file format: IMGFMT
808
-virtual size: 4.0M (4194304 bytes)
809
+virtual size: 4 MiB (4194304 bytes)
810
811
812
image: TEST_IMG
813
file format: IMGFMT
814
-virtual size: 4.0M (4194304 bytes)
815
+virtual size: 4 MiB (4194304 bytes)
816
817
=== Test host-key-check options ===
818
819
@@ -XXX,XX +XXX,XX @@ virtual size: 4.0M (4194304 bytes)
820
821
image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}
822
file format: IMGFMT
823
-virtual size: 8.0M (8388608 bytes)
824
+virtual size: 8 MiB (8388608 bytes)
825
826
{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": {"driver": "ssh", "location": {"host-key-check": {"mode": "known_hosts"}, "path": "TEST_DIR/PID-t.img", "server": {"host": "127.0.0.1", "port": "22"}}, "size": 4194304}}}
827
{"return": {}}
828
@@ -XXX,XX +XXX,XX @@ virtual size: 8.0M (8388608 bytes)
829
830
image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}
831
file format: IMGFMT
832
-virtual size: 4.0M (4194304 bytes)
833
+virtual size: 4 MiB (4194304 bytes)
834
835
{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": {"driver": "ssh", "location": {"host-key-check": {"hash": "wrong", "mode": "hash", "type": "md5"}, "path": "TEST_DIR/PID-t.img", "server": {"host": "127.0.0.1", "port": "22"}}, "size": 2097152}}}
836
{"return": {}}
837
@@ -XXX,XX +XXX,XX @@ Job failed: remote host key does not match host_key_check 'wrong'
838
839
image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}
840
file format: IMGFMT
841
-virtual size: 8.0M (8388608 bytes)
842
+virtual size: 8 MiB (8388608 bytes)
843
844
{"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": {"driver": "ssh", "location": {"host-key-check": {"hash": "wrong", "mode": "hash", "type": "sha1"}, "path": "TEST_DIR/PID-t.img", "server": {"host": "127.0.0.1", "port": "22"}}, "size": 2097152}}}
845
{"return": {}}
846
@@ -XXX,XX +XXX,XX @@ Job failed: remote host key does not match host_key_check 'wrong'
847
848
image: json:{"driver": "IMGFMT", "file": {"server.host": "127.0.0.1", "server.port": "22", "driver": "ssh", "path": "TEST_IMG"}}
849
file format: IMGFMT
850
-virtual size: 4.0M (4194304 bytes)
851
+virtual size: 4 MiB (4194304 bytes)
852
853
=== Invalid path and user ===
854
855
diff --git a/tests/qemu-iotests/210.out b/tests/qemu-iotests/210.out
856
index XXXXXXX..XXXXXXX 100644
857
--- a/tests/qemu-iotests/210.out
858
+++ b/tests/qemu-iotests/210.out
859
@@ -XXX,XX +XXX,XX @@
860
861
image: json:{"driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_IMG"}, "key-secret": "keysec0"}
862
file format: IMGFMT
863
-virtual size: 128M (134217728 bytes)
864
+virtual size: 128 MiB (134217728 bytes)
865
encrypted: yes
866
Format specific information:
867
ivgen alg: plain64
868
@@ -XXX,XX +XXX,XX @@ Format specific information:
869
870
image: json:{"driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_IMG"}, "key-secret": "keysec0"}
871
file format: IMGFMT
872
-virtual size: 64M (67108864 bytes)
873
+virtual size: 64 MiB (67108864 bytes)
874
encrypted: yes
875
Format specific information:
876
ivgen alg: plain64
877
@@ -XXX,XX +XXX,XX @@ Job failed: Cannot find device=this doesn't exist nor node_name=this doesn't exi
878
879
image: json:{"driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_IMG"}, "key-secret": "keysec0"}
880
file format: IMGFMT
881
-virtual size: 0 (0 bytes)
882
+virtual size: 0 B (0 bytes)
883
encrypted: yes
884
Format specific information:
885
ivgen alg: plain64
886
@@ -XXX,XX +XXX,XX @@ Job failed: The requested file size is too large
887
{"error": {"class": "GenericError", "desc": "Parameter 'size' expects a >0 size"}}
888
image: json:{"driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_IMG"}, "key-secret": "keysec0"}
889
file format: IMGFMT
890
-virtual size: 0 (0 bytes)
891
+virtual size: 0 B (0 bytes)
892
encrypted: yes
893
Format specific information:
894
ivgen alg: plain64
895
diff --git a/tests/qemu-iotests/211.out b/tests/qemu-iotests/211.out
896
index XXXXXXX..XXXXXXX 100644
897
--- a/tests/qemu-iotests/211.out
898
+++ b/tests/qemu-iotests/211.out
899
@@ -XXX,XX +XXX,XX @@
900
901
image: TEST_IMG
902
file format: IMGFMT
903
-virtual size: 128M (134217728 bytes)
904
+virtual size: 128 MiB (134217728 bytes)
905
cluster_size: 1048576
906
907
[{ "start": 0, "length": 134217728, "depth": 0, "zero": true, "data": false}]
908
@@ -XXX,XX +XXX,XX @@ cluster_size: 1048576
909
910
image: TEST_IMG
911
file format: IMGFMT
912
-virtual size: 64M (67108864 bytes)
913
+virtual size: 64 MiB (67108864 bytes)
914
cluster_size: 1048576
915
916
[{ "start": 0, "length": 67108864, "depth": 0, "zero": true, "data": false}]
917
@@ -XXX,XX +XXX,XX @@ cluster_size: 1048576
918
919
image: TEST_IMG
920
file format: IMGFMT
921
-virtual size: 32M (33554432 bytes)
922
+virtual size: 32 MiB (33554432 bytes)
923
cluster_size: 1048576
924
925
[{ "start": 0, "length": 3072, "depth": 0, "zero": false, "data": true, "offset": 1024},
926
@@ -XXX,XX +XXX,XX @@ Job failed: Cannot find device=this doesn't exist nor node_name=this doesn't exi
927
928
image: TEST_IMG
929
file format: IMGFMT
930
-virtual size: 0 (0 bytes)
931
+virtual size: 0 B (0 bytes)
932
cluster_size: 1048576
933
934
=== Maximum size ===
935
@@ -XXX,XX +XXX,XX @@ cluster_size: 1048576
936
937
image: TEST_IMG
938
file format: IMGFMT
939
-virtual size: 512T (562949819203584 bytes)
940
+virtual size: 512 TiB (562949819203584 bytes)
941
cluster_size: 1048576
942
943
=== Invalid sizes ===
944
diff --git a/tests/qemu-iotests/212.out b/tests/qemu-iotests/212.out
945
index XXXXXXX..XXXXXXX 100644
946
--- a/tests/qemu-iotests/212.out
947
+++ b/tests/qemu-iotests/212.out
948
@@ -XXX,XX +XXX,XX @@
949
950
image: TEST_IMG
951
file format: IMGFMT
952
-virtual size: 128M (134217728 bytes)
953
+virtual size: 128 MiB (134217728 bytes)
954
955
=== Successful image creation (explicit defaults) ===
956
957
@@ -XXX,XX +XXX,XX @@ virtual size: 128M (134217728 bytes)
958
959
image: TEST_IMG
960
file format: IMGFMT
961
-virtual size: 64M (67108864 bytes)
962
+virtual size: 64 MiB (67108864 bytes)
963
964
=== Successful image creation (with non-default options) ===
965
966
@@ -XXX,XX +XXX,XX @@ virtual size: 64M (67108864 bytes)
967
968
image: TEST_IMG
969
file format: IMGFMT
970
-virtual size: 32M (33554432 bytes)
971
+virtual size: 32 MiB (33554432 bytes)
972
973
=== Invalid BlockdevRef ===
974
975
@@ -XXX,XX +XXX,XX @@ Job failed: Cannot find device=this doesn't exist nor node_name=this doesn't exi
976
977
image: TEST_IMG
978
file format: IMGFMT
979
-virtual size: 0 (0 bytes)
980
+virtual size: 0 B (0 bytes)
981
982
=== Maximum size ===
983
984
@@ -XXX,XX +XXX,XX @@ virtual size: 0 (0 bytes)
985
986
image: TEST_IMG
987
file format: IMGFMT
988
-virtual size: 4096T (4503599627369984 bytes)
989
+virtual size: 4 PiB (4503599627369984 bytes)
990
991
=== Invalid sizes ===
992
993
diff --git a/tests/qemu-iotests/213.out b/tests/qemu-iotests/213.out
994
index XXXXXXX..XXXXXXX 100644
995
--- a/tests/qemu-iotests/213.out
996
+++ b/tests/qemu-iotests/213.out
997
@@ -XXX,XX +XXX,XX @@
998
999
image: TEST_IMG
1000
file format: IMGFMT
1001
-virtual size: 128M (134217728 bytes)
1002
+virtual size: 128 MiB (134217728 bytes)
1003
cluster_size: 8388608
1004
1005
=== Successful image creation (explicit defaults) ===
1006
@@ -XXX,XX +XXX,XX @@ cluster_size: 8388608
1007
1008
image: TEST_IMG
1009
file format: IMGFMT
1010
-virtual size: 64M (67108864 bytes)
1011
+virtual size: 64 MiB (67108864 bytes)
1012
cluster_size: 8388608
1013
1014
=== Successful image creation (with non-default options) ===
1015
@@ -XXX,XX +XXX,XX @@ cluster_size: 8388608
1016
1017
image: TEST_IMG
1018
file format: IMGFMT
1019
-virtual size: 32M (33554432 bytes)
1020
+virtual size: 32 MiB (33554432 bytes)
1021
cluster_size: 268435456
1022
1023
=== Invalid BlockdevRef ===
1024
@@ -XXX,XX +XXX,XX @@ Job failed: Cannot find device=this doesn't exist nor node_name=this doesn't exi
1025
1026
image: TEST_IMG
1027
file format: IMGFMT
1028
-virtual size: 0 (0 bytes)
1029
+virtual size: 0 B (0 bytes)
1030
cluster_size: 8388608
1031
1032
=== Maximum size ===
1033
@@ -XXX,XX +XXX,XX @@ cluster_size: 8388608
1034
1035
image: TEST_IMG
1036
file format: IMGFMT
1037
-virtual size: 64T (70368744177664 bytes)
1038
+virtual size: 64 TiB (70368744177664 bytes)
1039
cluster_size: 67108864
1040
1041
=== Invalid sizes ===
1042
diff --git a/tests/qemu-iotests/233.out b/tests/qemu-iotests/233.out
1043
index XXXXXXX..XXXXXXX 100644
1044
--- a/tests/qemu-iotests/233.out
1045
+++ b/tests/qemu-iotests/233.out
1046
@@ -XXX,XX +XXX,XX @@ server reported: Option 0x8 not permitted before TLS
1047
== check TLS works ==
1048
image: nbd://127.0.0.1:PORT
1049
file format: nbd
1050
-virtual size: 64M (67108864 bytes)
1051
+virtual size: 64 MiB (67108864 bytes)
1052
disk size: unavailable
1053
image: nbd://127.0.0.1:PORT
1054
file format: nbd
1055
-virtual size: 64M (67108864 bytes)
1056
+virtual size: 64 MiB (67108864 bytes)
1057
disk size: unavailable
1058
exports available: 1
1059
export: ''
1060
diff --git a/tests/qemu-iotests/237.out b/tests/qemu-iotests/237.out
1061
index XXXXXXX..XXXXXXX 100644
1062
--- a/tests/qemu-iotests/237.out
1063
+++ b/tests/qemu-iotests/237.out
1064
@@ -XXX,XX +XXX,XX @@
1065
1066
image: TEST_IMG
1067
file format: IMGFMT
1068
-virtual size: 5.0G (5368709120 bytes)
1069
+virtual size: 5 GiB (5368709120 bytes)
1070
cluster_size: 65536
1071
Format specific information:
1072
cid: XXXXXXXXXX
1073
@@ -XXX,XX +XXX,XX @@ Format specific information:
1074
1075
image: TEST_IMG
1076
file format: IMGFMT
1077
-virtual size: 64M (67108864 bytes)
1078
+virtual size: 64 MiB (67108864 bytes)
1079
cluster_size: 65536
1080
Format specific information:
1081
cid: XXXXXXXXXX
1082
@@ -XXX,XX +XXX,XX @@ Format specific information:
1083
1084
image: TEST_IMG
1085
file format: IMGFMT
1086
-virtual size: 32M (33554432 bytes)
1087
+virtual size: 32 MiB (33554432 bytes)
1088
cluster_size: 65536
1089
Format specific information:
1090
cid: XXXXXXXXXX
1091
@@ -XXX,XX +XXX,XX @@ Job failed: List of extents contains unused extents
1092
1093
image: TEST_IMG
1094
file format: IMGFMT
1095
-virtual size: 512 (512 bytes)
1096
+virtual size: 512 B (512 bytes)
1097
Format specific information:
1098
cid: XXXXXXXXXX
1099
parent cid: XXXXXXXXXX
1100
@@ -XXX,XX +XXX,XX @@ Format specific information:
1101
1102
image: TEST_IMG
1103
file format: IMGFMT
1104
-virtual size: 512 (512 bytes)
1105
+virtual size: 512 B (512 bytes)
1106
cluster_size: 65536
1107
Format specific information:
1108
cid: XXXXXXXXXX
1109
@@ -XXX,XX +XXX,XX @@ Format specific information:
1110
1111
image: TEST_IMG
1112
file format: IMGFMT
1113
-virtual size: 1.0G (1073741824 bytes)
1114
+virtual size: 1 GiB (1073741824 bytes)
1115
Format specific information:
1116
cid: XXXXXXXXXX
1117
parent cid: XXXXXXXXXX
1118
@@ -XXX,XX +XXX,XX @@ Format specific information:
1119
1120
image: TEST_IMG
1121
file format: IMGFMT
1122
-virtual size: 1.0G (1073741824 bytes)
1123
+virtual size: 1 GiB (1073741824 bytes)
1124
cluster_size: 65536
1125
Format specific information:
1126
cid: XXXXXXXXXX
1127
@@ -XXX,XX +XXX,XX @@ Format specific information:
1128
1129
image: TEST_IMG
1130
file format: IMGFMT
1131
-virtual size: 2.0G (2147483648 bytes)
1132
+virtual size: 2 GiB (2147483648 bytes)
1133
Format specific information:
1134
cid: XXXXXXXXXX
1135
parent cid: XXXXXXXXXX
1136
@@ -XXX,XX +XXX,XX @@ Format specific information:
1137
1138
image: TEST_IMG
1139
file format: IMGFMT
1140
-virtual size: 2.0G (2147483648 bytes)
1141
+virtual size: 2 GiB (2147483648 bytes)
1142
cluster_size: 65536
1143
Format specific information:
1144
cid: XXXXXXXXXX
1145
@@ -XXX,XX +XXX,XX @@ Format specific information:
1146
1147
image: TEST_IMG
1148
file format: IMGFMT
1149
-virtual size: 5.0G (5368709120 bytes)
1150
+virtual size: 5 GiB (5368709120 bytes)
1151
Format specific information:
1152
cid: XXXXXXXXXX
1153
parent cid: XXXXXXXXXX
1154
@@ -XXX,XX +XXX,XX @@ Format specific information:
1155
1156
image: TEST_IMG
1157
file format: IMGFMT
1158
-virtual size: 5.0G (5368709120 bytes)
1159
+virtual size: 5 GiB (5368709120 bytes)
1160
cluster_size: 65536
1161
Format specific information:
1162
cid: XXXXXXXXXX
1163
diff --git a/tests/qemu-iotests/242.out b/tests/qemu-iotests/242.out
1164
index XXXXXXX..XXXXXXX 100644
1165
--- a/tests/qemu-iotests/242.out
1166
+++ b/tests/qemu-iotests/242.out
1167
@@ -XXX,XX +XXX,XX @@ qemu-img info dump:
1168
1169
image: TEST_IMG
1170
file format: IMGFMT
1171
-virtual size: 1.0M (1048576 bytes)
1172
+virtual size: 1 MiB (1048576 bytes)
1173
cluster_size: 65536
1174
Format specific information:
1175
compat: 1.1
1176
@@ -XXX,XX +XXX,XX @@ qemu-img info dump:
1177
1178
image: TEST_IMG
1179
file format: IMGFMT
1180
-virtual size: 1.0M (1048576 bytes)
1181
+virtual size: 1 MiB (1048576 bytes)
1182
cluster_size: 65536
1183
Format specific information:
1184
compat: 1.1
1185
@@ -XXX,XX +XXX,XX @@ qemu-img info dump:
1186
1187
image: TEST_IMG
1188
file format: IMGFMT
1189
-virtual size: 1.0M (1048576 bytes)
1190
+virtual size: 1 MiB (1048576 bytes)
1191
cluster_size: 65536
1192
Format specific information:
1193
compat: 1.1
1194
@@ -XXX,XX +XXX,XX @@ qemu-img info dump:
1195
1196
image: TEST_IMG
1197
file format: IMGFMT
1198
-virtual size: 1.0M (1048576 bytes)
1199
+virtual size: 1 MiB (1048576 bytes)
1200
cluster_size: 65536
1201
Format specific information:
1202
compat: 1.1
1203
@@ -XXX,XX +XXX,XX @@ Unset the unknown bitmap flag '0x4' in the bitmap directory entry:
1204
1205
image: TEST_IMG
1206
file format: IMGFMT
1207
-virtual size: 1.0M (1048576 bytes)
1208
+virtual size: 1 MiB (1048576 bytes)
1209
cluster_size: 65536
1210
Format specific information:
1211
compat: 1.1
1212
--
1213
2.20.1
1214
1215
diff view generated by jsdifflib
Deleted patch
1
Limiting the allocation to INT_MAX bytes isn't particularly clever
2
because it means that the final cluster will be a partial cluster which
3
will be completed through a COW operation. This results in unnecessary
4
data read and write requests which lead to an unwanted non-sparse
5
filesystem block for metadata preallocation.
6
1
7
Align the maximum allocation size down to the cluster size to avoid this
8
situation.
9
10
Cc: qemu-stable@nongnu.org
11
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
12
Reviewed-by: Eric Blake <eblake@redhat.com>
13
---
14
block/qcow2.c | 2 +-
15
1 file changed, 1 insertion(+), 1 deletion(-)
16
17
diff --git a/block/qcow2.c b/block/qcow2.c
18
index XXXXXXX..XXXXXXX 100644
19
--- a/block/qcow2.c
20
+++ b/block/qcow2.c
21
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,
22
bytes = new_length - offset;
23
24
while (bytes) {
25
- cur_bytes = MIN(bytes, INT_MAX);
26
+ cur_bytes = MIN(bytes, QEMU_ALIGN_DOWN(INT_MAX, s->cluster_size));
27
ret = qcow2_alloc_cluster_offset(bs, offset, &cur_bytes,
28
&host_offset, &meta);
29
if (ret < 0) {
30
--
31
2.20.1
32
33
diff view generated by jsdifflib
Deleted patch
1
We'll add a bdrv_co_truncate() call in the next patch which can return
2
an Error that we don't want to discard. So add an errp parameter to
3
preallocate_co().
4
1
5
Cc: qemu-stable@nongnu.org
6
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
7
Reviewed-by: Eric Blake <eblake@redhat.com>
8
---
9
block/qcow2.c | 11 ++++++-----
10
1 file changed, 6 insertions(+), 5 deletions(-)
11
12
diff --git a/block/qcow2.c b/block/qcow2.c
13
index XXXXXXX..XXXXXXX 100644
14
--- a/block/qcow2.c
15
+++ b/block/qcow2.c
16
@@ -XXX,XX +XXX,XX @@ static int qcow2_set_up_encryption(BlockDriverState *bs,
17
* Returns: 0 on success, -errno on failure.
18
*/
19
static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,
20
- uint64_t new_length)
21
+ uint64_t new_length, Error **errp)
22
{
23
BDRVQcow2State *s = bs->opaque;
24
uint64_t bytes;
25
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,
26
ret = qcow2_alloc_cluster_offset(bs, offset, &cur_bytes,
27
&host_offset, &meta);
28
if (ret < 0) {
29
+ error_setg_errno(errp, -ret, "Allocating clusters failed");
30
return ret;
31
}
32
33
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,
34
35
ret = qcow2_alloc_cluster_link_l2(bs, meta);
36
if (ret < 0) {
37
+ error_setg_errno(errp, -ret, "Mapping clusters failed");
38
qcow2_free_any_clusters(bs, meta->alloc_offset,
39
meta->nb_clusters, QCOW2_DISCARD_NEVER);
40
return ret;
41
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn preallocate_co(BlockDriverState *bs, uint64_t offset,
42
ret = bdrv_pwrite(s->data_file, (host_offset + cur_bytes) - 1,
43
&data, 1);
44
if (ret < 0) {
45
+ error_setg_errno(errp, -ret, "Writing to EOF failed");
46
return ret;
47
}
48
}
49
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
50
break;
51
52
case PREALLOC_MODE_METADATA:
53
- ret = preallocate_co(bs, old_length, offset);
54
+ ret = preallocate_co(bs, old_length, offset, errp);
55
if (ret < 0) {
56
- error_setg_errno(errp, -ret, "Preallocation failed");
57
goto fail;
58
}
59
break;
60
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
61
/* With a data file, preallocation means just allocating the metadata
62
* and forwarding the truncate request to the data file */
63
if (has_data_file(bs)) {
64
- ret = preallocate_co(bs, old_length, offset);
65
+ ret = preallocate_co(bs, old_length, offset, errp);
66
if (ret < 0) {
67
- error_setg_errno(errp, -ret, "Preallocation failed");
68
goto fail;
69
}
70
break;
71
--
72
2.20.1
73
74
diff view generated by jsdifflib
Deleted patch
1
From: Max Reitz <mreitz@redhat.com>
2
1
3
In the "amend" section of 082, we perform a single "convert" test
4
(namely "convert -o help"). That does not make sense, especially
5
because we have done exactly that "convert" test earlier in 082 already.
6
7
Replacing "convert" by "amend" yields an error, which is correct because
8
there is no point in "amend" having a default format. The user has to
9
either specify the format, or give a file for qemu-img to probe.
10
11
Signed-off-by: Max Reitz <mreitz@redhat.com>
12
Reviewed-by: John Snow <jsnow@redhat.com>
13
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
14
---
15
tests/qemu-iotests/082 | 5 ++++-
16
tests/qemu-iotests/082.out | 5 ++---
17
2 files changed, 6 insertions(+), 4 deletions(-)
18
19
diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082
20
index XXXXXXX..XXXXXXX 100755
21
--- a/tests/qemu-iotests/082
22
+++ b/tests/qemu-iotests/082
23
@@ -XXX,XX +XXX,XX @@ run_qemu_img amend -f $IMGFMT -o backing_file="$TEST_IMG" -o ,, -o help "$TEST_I
24
25
# Leave out everything that isn't needed
26
run_qemu_img amend -f $IMGFMT -o help
27
-run_qemu_img convert -o help
28
+
29
+# amend requires specifying either a format explicitly, or a file
30
+# which it can probe
31
+run_qemu_img amend -o help
32
33
# Try help option for a format that does not support amendment
34
run_qemu_img amend -f bochs -o help
35
diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out
36
index XXXXXXX..XXXXXXX 100644
37
--- a/tests/qemu-iotests/082.out
38
+++ b/tests/qemu-iotests/082.out
39
@@ -XXX,XX +XXX,XX @@ Creation options for 'qcow2':
40
41
Note that not all of these options may be amendable.
42
43
-Testing: convert -o help
44
-Supported options:
45
- size=<size> - Virtual disk size
46
+Testing: amend -o help
47
+qemu-img: Expecting one image file name
48
49
Testing: amend -f bochs -o help
50
qemu-img: Format driver 'bochs' does not support option amendment
51
--
52
2.20.1
53
54
diff view generated by jsdifflib
1
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
1
When extending the size of an image that has a backing file larger than
2
its old size, make sure that the backing file data doesn't become
3
visible in the guest, but the added area is properly zeroed out.
2
4
3
Move to _co_ versions of io functions qed_read_table() and
5
Consider the following scenario where the overlay is shorter than its
4
qed_write_table(), as we use qemu_co_mutex_unlock()
6
backing file:
5
anyway.
6
7
7
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
8
base.qcow2: AAAAAAAA
8
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
9
overlay.qcow2: BBBB
9
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
10
11
When resizing (extending) overlay.qcow2, the new blocks should not stay
12
unallocated and make the additional As from base.qcow2 visible like
13
before this patch, but zeros should be read.
14
15
A similar case happens with the various variants of a commit job when an
16
intermediate file is short (- for unallocated):
17
18
base.qcow2: A-A-AAAA
19
mid.qcow2: BB-B
20
top.qcow2: C--C--C-
21
22
After commit top.qcow2 to mid.qcow2, the following happens:
23
24
mid.qcow2: CB-C00C0 (correct result)
25
mid.qcow2: CB-C--C- (before this fix)
26
27
Without the fix, blocks that previously read as zeros on top.qcow2
28
suddenly turn into A.
29
30
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
31
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
32
Message-Id: <20200424125448.63318-8-kwolf@redhat.com>
33
Reviewed-by: Max Reitz <mreitz@redhat.com>
10
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
34
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
11
---
35
---
12
block/qed-table.c | 12 +++++-------
36
block/io.c | 25 +++++++++++++++++++++++++
13
block/qed.c | 6 ++----
37
1 file changed, 25 insertions(+)
14
2 files changed, 7 insertions(+), 11 deletions(-)
15
38
16
diff --git a/block/qed-table.c b/block/qed-table.c
39
diff --git a/block/io.c b/block/io.c
17
index XXXXXXX..XXXXXXX 100644
40
index XXXXXXX..XXXXXXX 100644
18
--- a/block/qed-table.c
41
--- a/block/io.c
19
+++ b/block/qed-table.c
42
+++ b/block/io.c
20
@@ -XXX,XX +XXX,XX @@
43
@@ -XXX,XX +XXX,XX @@ int coroutine_fn bdrv_co_truncate(BdrvChild *child, int64_t offset, bool exact,
21
/* Called with table_lock held. */
22
static int qed_read_table(BDRVQEDState *s, uint64_t offset, QEDTable *table)
23
{
24
- QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(
25
- qiov, table->offsets, s->header.cluster_size * s->header.table_size);
26
+ unsigned int bytes = s->header.cluster_size * s->header.table_size;
27
+
28
int noffsets;
29
int i, ret;
30
31
trace_qed_read_table(s, offset, table);
32
33
qemu_co_mutex_unlock(&s->table_lock);
34
- ret = bdrv_preadv(s->bs->file, offset, &qiov);
35
+ ret = bdrv_co_pread(s->bs->file, offset, bytes, table->offsets, 0);
36
qemu_co_mutex_lock(&s->table_lock);
37
if (ret < 0) {
38
goto out;
44
goto out;
39
}
45
}
40
46
41
/* Byteswap offsets */
47
+ /*
42
- noffsets = qiov.size / sizeof(uint64_t);
48
+ * If the image has a backing file that is large enough that it would
43
+ noffsets = bytes / sizeof(uint64_t);
49
+ * provide data for the new area, we cannot leave it unallocated because
44
for (i = 0; i < noffsets; i++) {
50
+ * then the backing file content would become visible. Instead, zero-fill
45
table->offsets[i] = le64_to_cpu(table->offsets[i]);
51
+ * the new area.
46
}
52
+ *
47
@@ -XXX,XX +XXX,XX @@ static int qed_write_table(BDRVQEDState *s, uint64_t offset, QEDTable *table,
53
+ * Note that if the image has a backing file, but was opened without the
48
unsigned int sector_mask = BDRV_SECTOR_SIZE / sizeof(uint64_t) - 1;
54
+ * backing file, taking care of keeping things consistent with that backing
49
unsigned int start, end, i;
55
+ * file is the user's responsibility.
50
QEDTable *new_table;
56
+ */
51
- QEMUIOVector qiov;
57
+ if (new_bytes && bs->backing) {
52
size_t len_bytes;
58
+ int64_t backing_len;
53
int ret;
59
+
54
60
+ backing_len = bdrv_getlength(backing_bs(bs));
55
@@ -XXX,XX +XXX,XX @@ static int qed_write_table(BDRVQEDState *s, uint64_t offset, QEDTable *table,
61
+ if (backing_len < 0) {
56
len_bytes = (end - start) * sizeof(uint64_t);
62
+ ret = backing_len;
57
63
+ error_setg_errno(errp, -ret, "Could not get backing file size");
58
new_table = qemu_blockalign(s->bs, len_bytes);
64
+ goto out;
59
- qemu_iovec_init_buf(&qiov, new_table->offsets, len_bytes);
65
+ }
60
66
+
61
/* Byteswap table */
67
+ if (backing_len > old_size) {
62
for (i = start; i < end; i++) {
68
+ flags |= BDRV_REQ_ZERO_WRITE;
63
@@ -XXX,XX +XXX,XX @@ static int qed_write_table(BDRVQEDState *s, uint64_t offset, QEDTable *table,
69
+ }
64
offset += start * sizeof(uint64_t);
70
+ }
65
71
+
66
qemu_co_mutex_unlock(&s->table_lock);
72
if (drv->bdrv_co_truncate) {
67
- ret = bdrv_pwritev(s->bs->file, offset, &qiov);
73
if (flags & ~bs->supported_truncate_flags) {
68
+ ret = bdrv_co_pwrite(s->bs->file, offset, len_bytes, new_table->offsets, 0);
74
error_setg(errp, "Block driver does not support requested flags");
69
qemu_co_mutex_lock(&s->table_lock);
70
trace_qed_write_table_cb(s, table, flush, ret);
71
if (ret < 0) {
72
diff --git a/block/qed.c b/block/qed.c
73
index XXXXXXX..XXXXXXX 100644
74
--- a/block/qed.c
75
+++ b/block/qed.c
76
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qed_write_header(BDRVQEDState *s)
77
int nsectors = DIV_ROUND_UP(sizeof(QEDHeader), BDRV_SECTOR_SIZE);
78
size_t len = nsectors * BDRV_SECTOR_SIZE;
79
uint8_t *buf;
80
- QEMUIOVector qiov;
81
int ret;
82
83
assert(s->allocating_acb || s->allocating_write_reqs_plugged);
84
85
buf = qemu_blockalign(s->bs, len);
86
- qemu_iovec_init_buf(&qiov, buf, len);
87
88
- ret = bdrv_co_preadv(s->bs->file, 0, qiov.size, &qiov, 0);
89
+ ret = bdrv_co_pread(s->bs->file, 0, len, buf, 0);
90
if (ret < 0) {
91
goto out;
92
}
93
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qed_write_header(BDRVQEDState *s)
94
/* Update header */
95
qed_header_cpu_to_le(&s->header, (QEDHeader *) buf);
96
97
- ret = bdrv_co_pwritev(s->bs->file, 0, qiov.size, &qiov, 0);
98
+ ret = bdrv_co_pwrite(s->bs->file, 0, len, buf, 0);
99
if (ret < 0) {
100
goto out;
101
}
102
--
75
--
103
2.20.1
76
2.25.3
104
77
105
78
diff view generated by jsdifflib
1
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
1
We want to keep TEST_IMG for the full path of the main test image, but
2
filter_testfiles() must be called for other test images before replacing
3
other things like the image format because the test directory path could
4
contain the format as a substring.
2
5
3
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
6
Insert a filter_testfiles() call between both.
4
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
7
5
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
8
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
9
Reviewed-by: Max Reitz <mreitz@redhat.com>
10
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
11
Message-Id: <20200424125448.63318-9-kwolf@redhat.com>
6
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
12
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
7
---
13
---
8
qemu-img.c | 13 ++++---------
14
tests/qemu-iotests/iotests.py | 5 +++--
9
1 file changed, 4 insertions(+), 9 deletions(-)
15
1 file changed, 3 insertions(+), 2 deletions(-)
10
16
11
diff --git a/qemu-img.c b/qemu-img.c
17
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
12
index XXXXXXX..XXXXXXX 100644
18
index XXXXXXX..XXXXXXX 100644
13
--- a/qemu-img.c
19
--- a/tests/qemu-iotests/iotests.py
14
+++ b/qemu-img.c
20
+++ b/tests/qemu-iotests/iotests.py
15
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn convert_co_read(ImgConvertState *s, int64_t sector_num,
21
@@ -XXX,XX +XXX,XX @@ def filter_img_info(output, filename):
16
int nb_sectors, uint8_t *buf)
22
for line in output.split('\n'):
17
{
23
if 'disk size' in line or 'actual-size' in line:
18
int n, ret;
24
continue
19
- QEMUIOVector qiov;
25
- line = line.replace(filename, 'TEST_IMG') \
20
26
- .replace(imgfmt, 'IMGFMT')
21
assert(nb_sectors <= s->buf_sectors);
27
+ line = line.replace(filename, 'TEST_IMG')
22
while (nb_sectors > 0) {
28
+ line = filter_testfiles(line)
23
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn convert_co_read(ImgConvertState *s, int64_t sector_num,
29
+ line = line.replace(imgfmt, 'IMGFMT')
24
bs_sectors = s->src_sectors[src_cur];
30
line = re.sub('iters: [0-9]+', 'iters: XXX', line)
25
31
line = re.sub('uuid: [-a-f0-9]+', 'uuid: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', line)
26
n = MIN(nb_sectors, bs_sectors - (sector_num - src_cur_offset));
32
line = re.sub('cid: [0-9]+', 'cid: XXXXXXXXXX', line)
27
- qemu_iovec_init_buf(&qiov, buf, n << BDRV_SECTOR_BITS);
28
29
- ret = blk_co_preadv(
30
+ ret = blk_co_pread(
31
blk, (sector_num - src_cur_offset) << BDRV_SECTOR_BITS,
32
- n << BDRV_SECTOR_BITS, &qiov, 0);
33
+ n << BDRV_SECTOR_BITS, buf, 0);
34
if (ret < 0) {
35
return ret;
36
}
37
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn convert_co_write(ImgConvertState *s, int64_t sector_num,
38
enum ImgConvertBlockStatus status)
39
{
40
int ret;
41
- QEMUIOVector qiov;
42
43
while (nb_sectors > 0) {
44
int n = nb_sectors;
45
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn convert_co_write(ImgConvertState *s, int64_t sector_num,
46
(s->compressed &&
47
!buffer_is_zero(buf, n * BDRV_SECTOR_SIZE)))
48
{
49
- qemu_iovec_init_buf(&qiov, buf, n << BDRV_SECTOR_BITS);
50
-
51
- ret = blk_co_pwritev(s->target, sector_num << BDRV_SECTOR_BITS,
52
- n << BDRV_SECTOR_BITS, &qiov, flags);
53
+ ret = blk_co_pwrite(s->target, sector_num << BDRV_SECTOR_BITS,
54
+ n << BDRV_SECTOR_BITS, buf, flags);
55
if (ret < 0) {
56
return ret;
57
}
58
--
33
--
59
2.20.1
34
2.25.3
60
35
61
36
diff view generated by jsdifflib
1
From: Alberto Garcia <berto@igalia.com>
1
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2
2
Message-Id: <20200424125448.63318-10-kwolf@redhat.com>
3
This tests the fix from the previous patch.
3
Reviewed-by: Max Reitz <mreitz@redhat.com>
4
4
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
5
Signed-off-by: Alberto Garcia <berto@igalia.com>
6
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
5
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
7
---
6
---
8
tests/qemu-iotests/249 | 115 +++++++++++++++++++++++++++++++++++++
7
tests/qemu-iotests/274 | 155 +++++++++++++++++++++
9
tests/qemu-iotests/249.out | 35 +++++++++++
8
tests/qemu-iotests/274.out | 268 +++++++++++++++++++++++++++++++++++++
10
tests/qemu-iotests/group | 1 +
9
tests/qemu-iotests/group | 1 +
11
3 files changed, 151 insertions(+)
10
3 files changed, 424 insertions(+)
12
create mode 100755 tests/qemu-iotests/249
11
create mode 100755 tests/qemu-iotests/274
13
create mode 100644 tests/qemu-iotests/249.out
12
create mode 100644 tests/qemu-iotests/274.out
14
13
15
diff --git a/tests/qemu-iotests/249 b/tests/qemu-iotests/249
14
diff --git a/tests/qemu-iotests/274 b/tests/qemu-iotests/274
16
new file mode 100755
15
new file mode 100755
17
index XXXXXXX..XXXXXXX
16
index XXXXXXX..XXXXXXX
18
--- /dev/null
17
--- /dev/null
19
+++ b/tests/qemu-iotests/249
18
+++ b/tests/qemu-iotests/274
20
@@ -XXX,XX +XXX,XX @@
19
@@ -XXX,XX +XXX,XX @@
21
+#!/usr/bin/env bash
20
+#!/usr/bin/env python3
22
+#
21
+#
23
+# Test that a backing image is put back in read-only mode after
22
+# Copyright (C) 2019 Red Hat, Inc.
24
+# block-commit (both when it fails and when it succeeds).
25
+#
26
+# Copyright (C) 2019 Igalia, S.L.
27
+#
23
+#
28
+# This program is free software; you can redistribute it and/or modify
24
+# This program is free software; you can redistribute it and/or modify
29
+# it under the terms of the GNU General Public License as published by
25
+# it under the terms of the GNU General Public License as published by
30
+# the Free Software Foundation; either version 2 of the License, or
26
+# the Free Software Foundation; either version 2 of the License, or
31
+# (at your option) any later version.
27
+# (at your option) any later version.
...
...
36
+# GNU General Public License for more details.
32
+# GNU General Public License for more details.
37
+#
33
+#
38
+# You should have received a copy of the GNU General Public License
34
+# You should have received a copy of the GNU General Public License
39
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
35
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
40
+#
36
+#
41
+
37
+# Creator/Owner: Kevin Wolf <kwolf@redhat.com>
42
+# creator
38
+#
43
+owner=berto@igalia.com
39
+# Some tests for short backing files and short overlays
44
+
40
+
45
+seq="$(basename $0)"
41
+import iotests
46
+echo "QA output created by $seq"
42
+
47
+
43
+iotests.verify_image_format(supported_fmts=['qcow2'])
48
+status=1    # failure is the default!
44
+iotests.verify_platform(['linux'])
49
+
45
+
50
+_cleanup()
46
+size_short = 1 * 1024 * 1024
51
+{
47
+size_long = 2 * 1024 * 1024
52
+ _cleanup_test_img
48
+size_diff = size_long - size_short
53
+ rm -f "$TEST_IMG.base"
49
+
54
+ rm -f "$TEST_IMG.int"
50
+def create_chain() -> None:
55
+}
51
+ iotests.qemu_img_log('create', '-f', iotests.imgfmt, base,
56
+trap "_cleanup; exit \$status" 0 1 2 3 15
52
+ str(size_long))
57
+
53
+ iotests.qemu_img_log('create', '-f', iotests.imgfmt, '-b', base, mid,
58
+# get standard environment, filters and checks
54
+ str(size_short))
59
+. ./common.rc
55
+ iotests.qemu_img_log('create', '-f', iotests.imgfmt, '-b', mid, top,
60
+. ./common.filter
56
+ str(size_long))
61
+. ./common.qemu
57
+
62
+
58
+ iotests.qemu_io_log('-c', 'write -P 1 0 %d' % size_long, base)
63
+# Any format implementing BlockDriver.bdrv_change_backing_file
59
+
64
+_supported_fmt qcow2 qed
60
+def create_vm() -> iotests.VM:
65
+_supported_proto file
61
+ vm = iotests.VM()
66
+_supported_os Linux
62
+ vm.add_blockdev('file,filename=%s,node-name=base-file' % base)
67
+
63
+ vm.add_blockdev('%s,file=base-file,node-name=base' % iotests.imgfmt)
68
+IMG_SIZE=1M
64
+ vm.add_blockdev('file,filename=%s,node-name=mid-file' % mid)
69
+
65
+ vm.add_blockdev('%s,file=mid-file,node-name=mid,backing=base'
70
+# Create the images: base <- int <- active
66
+ % iotests.imgfmt)
71
+TEST_IMG="$TEST_IMG.base" _make_test_img $IMG_SIZE | _filter_imgfmt
67
+ vm.add_drive(top, 'backing=mid,node-name=top')
72
+TEST_IMG="$TEST_IMG.int" _make_test_img -b "$TEST_IMG.base" | _filter_imgfmt
68
+ return vm
73
+_make_test_img -b "$TEST_IMG.int" | _filter_imgfmt
69
+
74
+
70
+with iotests.FilePath('base') as base, \
75
+# Launch QEMU with these two drives:
71
+ iotests.FilePath('mid') as mid, \
76
+# none0: base (read-only)
72
+ iotests.FilePath('top') as top:
77
+# none1: base <- int <- active
73
+
78
+_launch_qemu -drive if=none,file="${TEST_IMG}.base",node-name=base,read-only=on \
74
+ iotests.log('== Commit tests ==')
79
+ -drive if=none,file="${TEST_IMG}",backing.node-name=int,backing.backing=base
75
+
80
+
76
+ create_chain()
81
+_send_qemu_cmd $QEMU_HANDLE \
77
+
82
+ "{ 'execute': 'qmp_capabilities' }" \
78
+ iotests.log('=== Check visible data ===')
83
+ 'return'
79
+
84
+
80
+ iotests.qemu_io_log('-c', 'read -P 1 0 %d' % size_short, top)
85
+echo
81
+ iotests.qemu_io_log('-c', 'read -P 0 %d %d' % (size_short, size_diff), top)
86
+echo '=== Send a write command to a drive opened in read-only mode (1)'
82
+
87
+echo
83
+ iotests.log('=== Checking allocation status ===')
88
+_send_qemu_cmd $QEMU_HANDLE \
84
+
89
+ "{ 'execute': 'human-monitor-command',
85
+ iotests.qemu_io_log('-c', 'alloc 0 %d' % size_short,
90
+ 'arguments': {'command-line': 'qemu-io none0 \"aio_write 0 2k\"'}}" \
86
+ '-c', 'alloc %d %d' % (size_short, size_diff),
91
+ 'return'
87
+ base)
92
+
88
+
93
+echo
89
+ iotests.qemu_io_log('-c', 'alloc 0 %d' % size_short,
94
+echo '=== Run block-commit on base using an invalid filter node name'
90
+ '-c', 'alloc %d %d' % (size_short, size_diff),
95
+echo
91
+ mid)
96
+_send_qemu_cmd $QEMU_HANDLE \
92
+
97
+ "{ 'execute': 'block-commit',
93
+ iotests.qemu_io_log('-c', 'alloc 0 %d' % size_short,
98
+ 'arguments': {'job-id': 'job0', 'device': 'none1', 'top-node': 'int',
94
+ '-c', 'alloc %d %d' % (size_short, size_diff),
99
+ 'filter-node-name': '1234'}}" \
95
+ top)
100
+ 'error'
96
+
101
+
97
+ iotests.log('=== Checking map ===')
102
+echo
98
+
103
+echo '=== Send a write command to a drive opened in read-only mode (2)'
99
+ iotests.qemu_img_log('map', '--output=json', base)
104
+echo
100
+ iotests.qemu_img_log('map', '--output=human', base)
105
+_send_qemu_cmd $QEMU_HANDLE \
101
+ iotests.qemu_img_log('map', '--output=json', mid)
106
+ "{ 'execute': 'human-monitor-command',
102
+ iotests.qemu_img_log('map', '--output=human', mid)
107
+ 'arguments': {'command-line': 'qemu-io none0 \"aio_write 0 2k\"'}}" \
103
+ iotests.qemu_img_log('map', '--output=json', top)
108
+ 'return'
104
+ iotests.qemu_img_log('map', '--output=human', top)
109
+
105
+
110
+echo
106
+ iotests.log('=== Testing qemu-img commit (top -> mid) ===')
111
+echo '=== Run block-commit on base using the default filter node name'
107
+
112
+echo
108
+ iotests.qemu_img_log('commit', top)
113
+_send_qemu_cmd $QEMU_HANDLE \
109
+ iotests.img_info_log(mid)
114
+ "{ 'execute': 'block-commit',
110
+ iotests.qemu_io_log('-c', 'read -P 1 0 %d' % size_short, mid)
115
+ 'arguments': {'job-id': 'job0', 'device': 'none1', 'top-node': 'int'}}" \
111
+ iotests.qemu_io_log('-c', 'read -P 0 %d %d' % (size_short, size_diff), mid)
116
+ 'return'
112
+
117
+
113
+ iotests.log('=== Testing HMP commit (top -> mid) ===')
118
+# Wait for block-commit to finish
114
+
119
+_send_qemu_cmd $QEMU_HANDLE '' \
115
+ create_chain()
120
+ '"status": "null"'
116
+ with create_vm() as vm:
121
+
117
+ vm.launch()
122
+echo
118
+ vm.qmp_log('human-monitor-command', command_line='commit drive0')
123
+echo '=== Send a write command to a drive opened in read-only mode (3)'
119
+
124
+echo
120
+ iotests.img_info_log(mid)
125
+_send_qemu_cmd $QEMU_HANDLE \
121
+ iotests.qemu_io_log('-c', 'read -P 1 0 %d' % size_short, mid)
126
+ "{ 'execute': 'human-monitor-command',
122
+ iotests.qemu_io_log('-c', 'read -P 0 %d %d' % (size_short, size_diff), mid)
127
+ 'arguments': {'command-line': 'qemu-io none0 \"aio_write 0 2k\"'}}" \
123
+
128
+ 'return'
124
+ iotests.log('=== Testing QMP active commit (top -> mid) ===')
129
+
125
+
130
+_cleanup_qemu
126
+ create_chain()
131
+
127
+ with create_vm() as vm:
132
+# success, all done
128
+ vm.launch()
133
+echo "*** done"
129
+ vm.qmp_log('block-commit', device='top', base_node='mid',
134
+rm -f $seq.full
130
+ job_id='job0', auto_dismiss=False)
135
+status=0
131
+ vm.run_job('job0', wait=5)
136
diff --git a/tests/qemu-iotests/249.out b/tests/qemu-iotests/249.out
132
+
133
+ iotests.img_info_log(mid)
134
+ iotests.qemu_io_log('-c', 'read -P 1 0 %d' % size_short, mid)
135
+ iotests.qemu_io_log('-c', 'read -P 0 %d %d' % (size_short, size_diff), mid)
136
+
137
+
138
+ iotests.log('== Resize tests ==')
139
+
140
+ # Use different sizes for different allocation modes:
141
+ #
142
+ # We want to have at least one test where 32 bit truncation in the size of
143
+ # the overlapping area becomes visible. This is covered by the
144
+ # prealloc='off' case (1G to 6G is an overlap of 5G).
145
+ #
146
+ # However, we can only do this for modes that don't preallocate data
147
+ # because otherwise we might run out of space on the test host.
148
+ #
149
+ # We also want to test some unaligned combinations.
150
+ for (prealloc, base_size, top_size_old, top_size_new, off) in [
151
+ ('off', '6G', '1G', '8G', '5G'),
152
+ ('metadata', '32G', '30G', '33G', '31G'),
153
+ ('falloc', '10M', '5M', '15M', '9M'),
154
+ ('full', '16M', '8M', '12M', '11M'),
155
+ ('off', '384k', '253k', '512k', '253k'),
156
+ ('off', '400k', '256k', '512k', '336k'),
157
+ ('off', '512k', '256k', '500k', '436k')]:
158
+
159
+ iotests.log('=== preallocation=%s ===' % prealloc)
160
+ iotests.qemu_img_log('create', '-f', iotests.imgfmt, base, base_size)
161
+ iotests.qemu_img_log('create', '-f', iotests.imgfmt, '-b', base, top,
162
+ top_size_old)
163
+ iotests.qemu_io_log('-c', 'write -P 1 %s 64k' % off, base)
164
+
165
+ # After this, top_size_old to base_size should be allocated/zeroed.
166
+ #
167
+ # In theory, leaving base_size to top_size_new unallocated would be
168
+ # correct, but in practice, if we zero out anything, we zero out
169
+ # everything up to top_size_new.
170
+ iotests.qemu_img_log('resize', '-f', iotests.imgfmt,
171
+ '--preallocation', prealloc, top, top_size_new)
172
+ iotests.qemu_io_log('-c', 'read -P 0 %s 64k' % off, top)
173
+ iotests.qemu_io_log('-c', 'map', top)
174
+ iotests.qemu_img_log('map', '--output=json', top)
175
diff --git a/tests/qemu-iotests/274.out b/tests/qemu-iotests/274.out
137
new file mode 100644
176
new file mode 100644
138
index XXXXXXX..XXXXXXX
177
index XXXXXXX..XXXXXXX
139
--- /dev/null
178
--- /dev/null
140
+++ b/tests/qemu-iotests/249.out
179
+++ b/tests/qemu-iotests/274.out
141
@@ -XXX,XX +XXX,XX @@
180
@@ -XXX,XX +XXX,XX @@
142
+QA output created by 249
181
+== Commit tests ==
143
+Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=1048576
182
+Formatting 'TEST_DIR/PID-base', fmt=qcow2 size=2097152 cluster_size=65536 lazy_refcounts=off refcount_bits=16
144
+Formatting 'TEST_DIR/t.IMGFMT.int', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT.base
183
+
145
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT.int
184
+Formatting 'TEST_DIR/PID-mid', fmt=qcow2 size=1048576 backing_file=TEST_DIR/PID-base cluster_size=65536 lazy_refcounts=off refcount_bits=16
185
+
186
+Formatting 'TEST_DIR/PID-top', fmt=qcow2 size=2097152 backing_file=TEST_DIR/PID-mid cluster_size=65536 lazy_refcounts=off refcount_bits=16
187
+
188
+wrote 2097152/2097152 bytes at offset 0
189
+2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
190
+
191
+=== Check visible data ===
192
+read 1048576/1048576 bytes at offset 0
193
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
194
+
195
+read 1048576/1048576 bytes at offset 1048576
196
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
197
+
198
+=== Checking allocation status ===
199
+1048576/1048576 bytes allocated at offset 0 bytes
200
+1048576/1048576 bytes allocated at offset 1 MiB
201
+
202
+0/1048576 bytes allocated at offset 0 bytes
203
+0/0 bytes allocated at offset 1 MiB
204
+
205
+0/1048576 bytes allocated at offset 0 bytes
206
+0/1048576 bytes allocated at offset 1 MiB
207
+
208
+=== Checking map ===
209
+[{ "start": 0, "length": 2097152, "depth": 0, "zero": false, "data": true, "offset": 327680}]
210
+
211
+Offset Length Mapped to File
212
+0 0x200000 0x50000 TEST_DIR/PID-base
213
+
214
+[{ "start": 0, "length": 1048576, "depth": 1, "zero": false, "data": true, "offset": 327680}]
215
+
216
+Offset Length Mapped to File
217
+0 0x100000 0x50000 TEST_DIR/PID-base
218
+
219
+[{ "start": 0, "length": 1048576, "depth": 2, "zero": false, "data": true, "offset": 327680},
220
+{ "start": 1048576, "length": 1048576, "depth": 0, "zero": true, "data": false}]
221
+
222
+Offset Length Mapped to File
223
+0 0x100000 0x50000 TEST_DIR/PID-base
224
+
225
+=== Testing qemu-img commit (top -> mid) ===
226
+Image committed.
227
+
228
+image: TEST_IMG
229
+file format: IMGFMT
230
+virtual size: 2 MiB (2097152 bytes)
231
+cluster_size: 65536
232
+backing file: TEST_DIR/PID-base
233
+Format specific information:
234
+ compat: 1.1
235
+ lazy refcounts: false
236
+ refcount bits: 16
237
+ corrupt: false
238
+
239
+read 1048576/1048576 bytes at offset 0
240
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
241
+
242
+read 1048576/1048576 bytes at offset 1048576
243
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
244
+
245
+=== Testing HMP commit (top -> mid) ===
246
+Formatting 'TEST_DIR/PID-base', fmt=qcow2 size=2097152 cluster_size=65536 lazy_refcounts=off refcount_bits=16
247
+
248
+Formatting 'TEST_DIR/PID-mid', fmt=qcow2 size=1048576 backing_file=TEST_DIR/PID-base cluster_size=65536 lazy_refcounts=off refcount_bits=16
249
+
250
+Formatting 'TEST_DIR/PID-top', fmt=qcow2 size=2097152 backing_file=TEST_DIR/PID-mid cluster_size=65536 lazy_refcounts=off refcount_bits=16
251
+
252
+wrote 2097152/2097152 bytes at offset 0
253
+2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
254
+
255
+{"execute": "human-monitor-command", "arguments": {"command-line": "commit drive0"}}
256
+{"return": ""}
257
+image: TEST_IMG
258
+file format: IMGFMT
259
+virtual size: 2 MiB (2097152 bytes)
260
+cluster_size: 65536
261
+backing file: TEST_DIR/PID-base
262
+Format specific information:
263
+ compat: 1.1
264
+ lazy refcounts: false
265
+ refcount bits: 16
266
+ corrupt: false
267
+
268
+read 1048576/1048576 bytes at offset 0
269
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
270
+
271
+read 1048576/1048576 bytes at offset 1048576
272
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
273
+
274
+=== Testing QMP active commit (top -> mid) ===
275
+Formatting 'TEST_DIR/PID-base', fmt=qcow2 size=2097152 cluster_size=65536 lazy_refcounts=off refcount_bits=16
276
+
277
+Formatting 'TEST_DIR/PID-mid', fmt=qcow2 size=1048576 backing_file=TEST_DIR/PID-base cluster_size=65536 lazy_refcounts=off refcount_bits=16
278
+
279
+Formatting 'TEST_DIR/PID-top', fmt=qcow2 size=2097152 backing_file=TEST_DIR/PID-mid cluster_size=65536 lazy_refcounts=off refcount_bits=16
280
+
281
+wrote 2097152/2097152 bytes at offset 0
282
+2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
283
+
284
+{"execute": "block-commit", "arguments": {"auto-dismiss": false, "base-node": "mid", "device": "top", "job-id": "job0"}}
146
+{"return": {}}
285
+{"return": {}}
147
+
286
+{"execute": "job-complete", "arguments": {"id": "job0"}}
148
+=== Send a write command to a drive opened in read-only mode (1)
149
+
150
+{"return": "Block node is read-onlyrn"}
151
+
152
+=== Run block-commit on base using an invalid filter node name
153
+
154
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}}
155
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}}
156
+{"error": {"class": "GenericError", "desc": "Invalid node name"}}
157
+
158
+=== Send a write command to a drive opened in read-only mode (2)
159
+
160
+{"return": "Block node is read-onlyrn"}
161
+
162
+=== Run block-commit on base using the default filter node name
163
+
164
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "job0"}}
165
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "job0"}}
166
+{"return": {}}
287
+{"return": {}}
167
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "job0"}}
288
+{"data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}, "event": "BLOCK_JOB_READY", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
168
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "job0"}}
289
+{"data": {"device": "job0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}, "event": "BLOCK_JOB_COMPLETED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
169
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "job0", "len": 1048576, "offset": 1048576, "speed": 0, "type": "commit"}}
290
+{"execute": "job-dismiss", "arguments": {"id": "job0"}}
170
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "concluded", "id": "job0"}}
291
+{"return": {}}
171
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "JOB_STATUS_CHANGE", "data": {"status": "null", "id": "job0"}}
292
+image: TEST_IMG
172
+
293
+file format: IMGFMT
173
+=== Send a write command to a drive opened in read-only mode (3)
294
+virtual size: 2 MiB (2097152 bytes)
174
+
295
+cluster_size: 65536
175
+{"return": "Block node is read-onlyrn"}
296
+backing file: TEST_DIR/PID-base
176
+*** done
297
+Format specific information:
298
+ compat: 1.1
299
+ lazy refcounts: false
300
+ refcount bits: 16
301
+ corrupt: false
302
+
303
+read 1048576/1048576 bytes at offset 0
304
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
305
+
306
+read 1048576/1048576 bytes at offset 1048576
307
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
308
+
309
+== Resize tests ==
310
+=== preallocation=off ===
311
+Formatting 'TEST_DIR/PID-base', fmt=qcow2 size=6442450944 cluster_size=65536 lazy_refcounts=off refcount_bits=16
312
+
313
+Formatting 'TEST_DIR/PID-top', fmt=qcow2 size=1073741824 backing_file=TEST_DIR/PID-base cluster_size=65536 lazy_refcounts=off refcount_bits=16
314
+
315
+wrote 65536/65536 bytes at offset 5368709120
316
+64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
317
+
318
+Image resized.
319
+
320
+read 65536/65536 bytes at offset 5368709120
321
+64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
322
+
323
+1 GiB (0x40000000) bytes not allocated at offset 0 bytes (0x0)
324
+7 GiB (0x1c0000000) bytes allocated at offset 1 GiB (0x40000000)
325
+
326
+[{ "start": 0, "length": 1073741824, "depth": 1, "zero": true, "data": false},
327
+{ "start": 1073741824, "length": 7516192768, "depth": 0, "zero": true, "data": false}]
328
+
329
+=== preallocation=metadata ===
330
+Formatting 'TEST_DIR/PID-base', fmt=qcow2 size=34359738368 cluster_size=65536 lazy_refcounts=off refcount_bits=16
331
+
332
+Formatting 'TEST_DIR/PID-top', fmt=qcow2 size=32212254720 backing_file=TEST_DIR/PID-base cluster_size=65536 lazy_refcounts=off refcount_bits=16
333
+
334
+wrote 65536/65536 bytes at offset 33285996544
335
+64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
336
+
337
+Image resized.
338
+
339
+read 65536/65536 bytes at offset 33285996544
340
+64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
341
+
342
+30 GiB (0x780000000) bytes not allocated at offset 0 bytes (0x0)
343
+3 GiB (0xc0000000) bytes allocated at offset 30 GiB (0x780000000)
344
+
345
+[{ "start": 0, "length": 32212254720, "depth": 1, "zero": true, "data": false},
346
+{ "start": 32212254720, "length": 536870912, "depth": 0, "zero": true, "data": false, "offset": 327680},
347
+{ "start": 32749125632, "length": 536870912, "depth": 0, "zero": true, "data": false, "offset": 537264128},
348
+{ "start": 33285996544, "length": 536870912, "depth": 0, "zero": true, "data": false, "offset": 1074200576},
349
+{ "start": 33822867456, "length": 536870912, "depth": 0, "zero": true, "data": false, "offset": 1611137024},
350
+{ "start": 34359738368, "length": 536870912, "depth": 0, "zero": true, "data": false, "offset": 2148139008},
351
+{ "start": 34896609280, "length": 536870912, "depth": 0, "zero": true, "data": false, "offset": 2685075456}]
352
+
353
+=== preallocation=falloc ===
354
+Formatting 'TEST_DIR/PID-base', fmt=qcow2 size=10485760 cluster_size=65536 lazy_refcounts=off refcount_bits=16
355
+
356
+Formatting 'TEST_DIR/PID-top', fmt=qcow2 size=5242880 backing_file=TEST_DIR/PID-base cluster_size=65536 lazy_refcounts=off refcount_bits=16
357
+
358
+wrote 65536/65536 bytes at offset 9437184
359
+64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
360
+
361
+Image resized.
362
+
363
+read 65536/65536 bytes at offset 9437184
364
+64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
365
+
366
+5 MiB (0x500000) bytes not allocated at offset 0 bytes (0x0)
367
+10 MiB (0xa00000) bytes allocated at offset 5 MiB (0x500000)
368
+
369
+[{ "start": 0, "length": 5242880, "depth": 1, "zero": true, "data": false},
370
+{ "start": 5242880, "length": 10485760, "depth": 0, "zero": true, "data": false, "offset": 327680}]
371
+
372
+=== preallocation=full ===
373
+Formatting 'TEST_DIR/PID-base', fmt=qcow2 size=16777216 cluster_size=65536 lazy_refcounts=off refcount_bits=16
374
+
375
+Formatting 'TEST_DIR/PID-top', fmt=qcow2 size=8388608 backing_file=TEST_DIR/PID-base cluster_size=65536 lazy_refcounts=off refcount_bits=16
376
+
377
+wrote 65536/65536 bytes at offset 11534336
378
+64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
379
+
380
+Image resized.
381
+
382
+read 65536/65536 bytes at offset 11534336
383
+64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
384
+
385
+8 MiB (0x800000) bytes not allocated at offset 0 bytes (0x0)
386
+4 MiB (0x400000) bytes allocated at offset 8 MiB (0x800000)
387
+
388
+[{ "start": 0, "length": 8388608, "depth": 1, "zero": true, "data": false},
389
+{ "start": 8388608, "length": 4194304, "depth": 0, "zero": true, "data": false, "offset": 327680}]
390
+
391
+=== preallocation=off ===
392
+Formatting 'TEST_DIR/PID-base', fmt=qcow2 size=393216 cluster_size=65536 lazy_refcounts=off refcount_bits=16
393
+
394
+Formatting 'TEST_DIR/PID-top', fmt=qcow2 size=259072 backing_file=TEST_DIR/PID-base cluster_size=65536 lazy_refcounts=off refcount_bits=16
395
+
396
+wrote 65536/65536 bytes at offset 259072
397
+64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
398
+
399
+Image resized.
400
+
401
+read 65536/65536 bytes at offset 259072
402
+64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
403
+
404
+192 KiB (0x30000) bytes not allocated at offset 0 bytes (0x0)
405
+320 KiB (0x50000) bytes allocated at offset 192 KiB (0x30000)
406
+
407
+[{ "start": 0, "length": 196608, "depth": 1, "zero": true, "data": false},
408
+{ "start": 196608, "length": 65536, "depth": 0, "zero": false, "data": true, "offset": 327680},
409
+{ "start": 262144, "length": 262144, "depth": 0, "zero": true, "data": false}]
410
+
411
+=== preallocation=off ===
412
+Formatting 'TEST_DIR/PID-base', fmt=qcow2 size=409600 cluster_size=65536 lazy_refcounts=off refcount_bits=16
413
+
414
+Formatting 'TEST_DIR/PID-top', fmt=qcow2 size=262144 backing_file=TEST_DIR/PID-base cluster_size=65536 lazy_refcounts=off refcount_bits=16
415
+
416
+wrote 65536/65536 bytes at offset 344064
417
+64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
418
+
419
+Image resized.
420
+
421
+read 65536/65536 bytes at offset 344064
422
+64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
423
+
424
+256 KiB (0x40000) bytes not allocated at offset 0 bytes (0x0)
425
+256 KiB (0x40000) bytes allocated at offset 256 KiB (0x40000)
426
+
427
+[{ "start": 0, "length": 262144, "depth": 1, "zero": true, "data": false},
428
+{ "start": 262144, "length": 262144, "depth": 0, "zero": true, "data": false}]
429
+
430
+=== preallocation=off ===
431
+Formatting 'TEST_DIR/PID-base', fmt=qcow2 size=524288 cluster_size=65536 lazy_refcounts=off refcount_bits=16
432
+
433
+Formatting 'TEST_DIR/PID-top', fmt=qcow2 size=262144 backing_file=TEST_DIR/PID-base cluster_size=65536 lazy_refcounts=off refcount_bits=16
434
+
435
+wrote 65536/65536 bytes at offset 446464
436
+64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
437
+
438
+Image resized.
439
+
440
+read 65536/65536 bytes at offset 446464
441
+64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
442
+
443
+256 KiB (0x40000) bytes not allocated at offset 0 bytes (0x0)
444
+244 KiB (0x3d000) bytes allocated at offset 256 KiB (0x40000)
445
+
446
+[{ "start": 0, "length": 262144, "depth": 1, "zero": true, "data": false},
447
+{ "start": 262144, "length": 249856, "depth": 0, "zero": true, "data": false}]
448
+
177
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
449
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
178
index XXXXXXX..XXXXXXX 100644
450
index XXXXXXX..XXXXXXX 100644
179
--- a/tests/qemu-iotests/group
451
--- a/tests/qemu-iotests/group
180
+++ b/tests/qemu-iotests/group
452
+++ b/tests/qemu-iotests/group
181
@@ -XXX,XX +XXX,XX @@
453
@@ -XXX,XX +XXX,XX @@
182
246 rw auto quick
454
270 rw backing quick
183
247 rw auto quick
455
272 rw
184
248 rw auto quick
456
273 backing quick
185
+249 rw auto quick
457
+274 rw backing
458
277 rw quick
459
279 rw backing quick
460
280 rw migration quick
186
--
461
--
187
2.20.1
462
2.25.3
188
463
189
464
diff view generated by jsdifflib
1
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
1
The BDRV_REQ_ZERO_WRITE is currently implemented in a way that first the
2
image is possibly preallocated and then the zero flag is added to all
3
clusters. This means that a copy-on-write operation may be needed when
4
writing to these clusters, despite having used preallocation, negating
5
one of the major benefits of preallocation.
2
6
3
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
7
Instead, try to forward the BDRV_REQ_ZERO_WRITE to the protocol driver,
4
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
8
and if the protocol driver can ensure that the new area reads as zeros,
5
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
9
we can skip setting the zero flag in the qcow2 layer.
10
11
Unfortunately, the same approach doesn't work for metadata
12
preallocation, so we'll still set the zero flag there.
13
14
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
15
Reviewed-by: Max Reitz <mreitz@redhat.com>
16
Message-Id: <20200424142701.67053-1-kwolf@redhat.com>
17
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
6
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
18
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
7
---
19
---
8
block/qcow2.c | 9 ++-------
20
block/qcow2.c | 22 +++++++++++++++++++---
9
1 file changed, 2 insertions(+), 7 deletions(-)
21
tests/qemu-iotests/274.out | 4 ++--
22
2 files changed, 21 insertions(+), 5 deletions(-)
10
23
11
diff --git a/block/qcow2.c b/block/qcow2.c
24
diff --git a/block/qcow2.c b/block/qcow2.c
12
index XXXXXXX..XXXXXXX 100644
25
index XXXXXXX..XXXXXXX 100644
13
--- a/block/qcow2.c
26
--- a/block/qcow2.c
14
+++ b/block/qcow2.c
27
+++ b/block/qcow2.c
15
@@ -XXX,XX +XXX,XX @@ qcow2_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset,
28
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset,
16
uint64_t bytes, QEMUIOVector *qiov)
29
/* Allocate the data area */
17
{
30
new_file_size = allocation_start +
18
BDRVQcow2State *s = bs->opaque;
31
nb_new_data_clusters * s->cluster_size;
19
- QEMUIOVector hd_qiov;
32
- /* Image file grows, so @exact does not matter */
20
int ret;
33
- ret = bdrv_co_truncate(bs->file, new_file_size, false, prealloc, 0,
21
ssize_t out_len;
34
- errp);
22
uint8_t *buf, *out_buf;
35
+ /*
23
@@ -XXX,XX +XXX,XX @@ qcow2_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset,
36
+ * Image file grows, so @exact does not matter.
24
goto fail;
37
+ *
25
}
38
+ * If we need to zero out the new area, try first whether the protocol
26
39
+ * driver can already take care of this.
27
- qemu_iovec_init_buf(&hd_qiov, out_buf, out_len);
40
+ */
28
-
41
+ if (flags & BDRV_REQ_ZERO_WRITE) {
29
BLKDBG_EVENT(s->data_file, BLKDBG_WRITE_COMPRESSED);
42
+ ret = bdrv_co_truncate(bs->file, new_file_size, false, prealloc,
30
- ret = bdrv_co_pwritev(s->data_file, cluster_offset, out_len, &hd_qiov, 0);
43
+ BDRV_REQ_ZERO_WRITE, NULL);
31
+ ret = bdrv_co_pwrite(s->data_file, cluster_offset, out_len, out_buf, 0);
44
+ if (ret >= 0) {
32
if (ret < 0) {
45
+ flags &= ~BDRV_REQ_ZERO_WRITE;
33
goto fail;
46
+ }
34
}
47
+ } else {
35
@@ -XXX,XX +XXX,XX @@ qcow2_co_preadv_compressed(BlockDriverState *bs,
48
+ ret = -1;
36
int ret = 0, csize, nb_csectors;
49
+ }
37
uint64_t coffset;
50
+ if (ret < 0) {
38
uint8_t *buf, *out_buf;
51
+ ret = bdrv_co_truncate(bs->file, new_file_size, false, prealloc, 0,
39
- QEMUIOVector local_qiov;
52
+ errp);
40
int offset_in_cluster = offset_into_cluster(s, offset);
53
+ }
41
54
if (ret < 0) {
42
coffset = file_cluster_offset & s->cluster_offset_mask;
55
error_prepend(errp, "Failed to resize underlying file: ");
43
@@ -XXX,XX +XXX,XX @@ qcow2_co_preadv_compressed(BlockDriverState *bs,
56
qcow2_free_clusters(bs, allocation_start,
44
if (!buf) {
57
diff --git a/tests/qemu-iotests/274.out b/tests/qemu-iotests/274.out
45
return -ENOMEM;
58
index XXXXXXX..XXXXXXX 100644
46
}
59
--- a/tests/qemu-iotests/274.out
47
- qemu_iovec_init_buf(&local_qiov, buf, csize);
60
+++ b/tests/qemu-iotests/274.out
48
61
@@ -XXX,XX +XXX,XX @@ read 65536/65536 bytes at offset 9437184
49
out_buf = qemu_blockalign(bs, s->cluster_size);
62
10 MiB (0xa00000) bytes allocated at offset 5 MiB (0x500000)
50
63
51
BLKDBG_EVENT(bs->file, BLKDBG_READ_COMPRESSED);
64
[{ "start": 0, "length": 5242880, "depth": 1, "zero": true, "data": false},
52
- ret = bdrv_co_preadv(bs->file, coffset, csize, &local_qiov, 0);
65
-{ "start": 5242880, "length": 10485760, "depth": 0, "zero": true, "data": false, "offset": 327680}]
53
+ ret = bdrv_co_pread(bs->file, coffset, csize, buf, 0);
66
+{ "start": 5242880, "length": 10485760, "depth": 0, "zero": false, "data": true, "offset": 327680}]
54
if (ret < 0) {
67
55
goto fail;
68
=== preallocation=full ===
56
}
69
Formatting 'TEST_DIR/PID-base', fmt=qcow2 size=16777216 cluster_size=65536 lazy_refcounts=off refcount_bits=16
70
@@ -XXX,XX +XXX,XX @@ read 65536/65536 bytes at offset 11534336
71
4 MiB (0x400000) bytes allocated at offset 8 MiB (0x800000)
72
73
[{ "start": 0, "length": 8388608, "depth": 1, "zero": true, "data": false},
74
-{ "start": 8388608, "length": 4194304, "depth": 0, "zero": true, "data": false, "offset": 327680}]
75
+{ "start": 8388608, "length": 4194304, "depth": 0, "zero": false, "data": true, "offset": 327680}]
76
77
=== preallocation=off ===
78
Formatting 'TEST_DIR/PID-base', fmt=qcow2 size=393216 cluster_size=65536 lazy_refcounts=off refcount_bits=16
57
--
79
--
58
2.20.1
80
2.25.3
59
81
60
82
diff view generated by jsdifflib
1
From: Alberto Garcia <berto@igalia.com>
1
From: Andrzej Jakowski <andrzej.jakowski@linux.intel.com>
2
2
3
This patch fixes a few things in the way error codes are handled in
3
This patch introduces support for PMR that has been defined as part of NVMe 1.4
4
the qcow2 compression code:
4
spec. User can now specify a pmrdev option that should point to HostMemoryBackend.
5
pmrdev memory region will subsequently be exposed as PCI BAR 2 in emulated NVMe
6
device. Guest OS can perform mmio read and writes to the PMR region that will stay
7
persistent across system reboot.
5
8
6
a) qcow2_co_pwritev_compressed() expects qcow2_co_compress() to only
9
Signed-off-by: Andrzej Jakowski <andrzej.jakowski@linux.intel.com>
7
return -1 or -2 on failure, but this is not correct. Since the
10
Reviewed-by: Klaus Jensen <k.jensen@samsung.com>
8
change from qcow2_compress() to qcow2_co_compress() in commit
11
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
9
ceb029cd6feccf9f7607 the new code can also return -EINVAL (although
12
Message-Id: <20200330164656.9348-1-andrzej.jakowski@linux.intel.com>
10
there does not seem to exist any code path that would cause that
13
Reviewed-by: Keith Busch <kbusch@kernel.org>
11
error in the current implementation).
12
13
b) -1 and -2 are ad-hoc error codes defined in qcow2_compress().
14
This patch replaces them with standard constants from errno.h.
15
16
c) Both qcow2_compress() and qcow2_co_do_compress() return a negative
17
value on failure, but qcow2_co_pwritev_compressed() stores the
18
value in an unsigned data type.
19
20
Signed-off-by: Alberto Garcia <berto@igalia.com>
21
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
14
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
22
---
15
---
23
block/qcow2.c | 18 +++++++++---------
16
hw/block/nvme.h | 2 +
24
1 file changed, 9 insertions(+), 9 deletions(-)
17
include/block/nvme.h | 172 +++++++++++++++++++++++++++++++++++++++++
18
hw/block/nvme.c | 109 ++++++++++++++++++++++++++
19
hw/block/Makefile.objs | 2 +-
20
hw/block/trace-events | 4 +
21
5 files changed, 288 insertions(+), 1 deletion(-)
25
22
26
diff --git a/block/qcow2.c b/block/qcow2.c
23
diff --git a/hw/block/nvme.h b/hw/block/nvme.h
27
index XXXXXXX..XXXXXXX 100644
24
index XXXXXXX..XXXXXXX 100644
28
--- a/block/qcow2.c
25
--- a/hw/block/nvme.h
29
+++ b/block/qcow2.c
26
+++ b/hw/block/nvme.h
30
@@ -XXX,XX +XXX,XX @@ fail:
27
@@ -XXX,XX +XXX,XX @@ typedef struct NvmeCtrl {
31
* @src - source buffer, @src_size bytes
28
uint64_t timestamp_set_qemu_clock_ms; /* QEMU clock time */
29
30
char *serial;
31
+ HostMemoryBackend *pmrdev;
32
+
33
NvmeNamespace *namespaces;
34
NvmeSQueue **sq;
35
NvmeCQueue **cq;
36
diff --git a/include/block/nvme.h b/include/block/nvme.h
37
index XXXXXXX..XXXXXXX 100644
38
--- a/include/block/nvme.h
39
+++ b/include/block/nvme.h
40
@@ -XXX,XX +XXX,XX @@ typedef struct NvmeBar {
41
uint64_t acq;
42
uint32_t cmbloc;
43
uint32_t cmbsz;
44
+ uint8_t padding[3520]; /* not used by QEMU */
45
+ uint32_t pmrcap;
46
+ uint32_t pmrctl;
47
+ uint32_t pmrsts;
48
+ uint32_t pmrebs;
49
+ uint32_t pmrswtp;
50
+ uint32_t pmrmsc;
51
} NvmeBar;
52
53
enum NvmeCapShift {
54
@@ -XXX,XX +XXX,XX @@ enum NvmeCapShift {
55
CAP_CSS_SHIFT = 37,
56
CAP_MPSMIN_SHIFT = 48,
57
CAP_MPSMAX_SHIFT = 52,
58
+ CAP_PMR_SHIFT = 56,
59
};
60
61
enum NvmeCapMask {
62
@@ -XXX,XX +XXX,XX @@ enum NvmeCapMask {
63
CAP_CSS_MASK = 0xff,
64
CAP_MPSMIN_MASK = 0xf,
65
CAP_MPSMAX_MASK = 0xf,
66
+ CAP_PMR_MASK = 0x1,
67
};
68
69
#define NVME_CAP_MQES(cap) (((cap) >> CAP_MQES_SHIFT) & CAP_MQES_MASK)
70
@@ -XXX,XX +XXX,XX @@ enum NvmeCapMask {
71
<< CAP_MPSMIN_SHIFT)
72
#define NVME_CAP_SET_MPSMAX(cap, val) (cap |= (uint64_t)(val & CAP_MPSMAX_MASK)\
73
<< CAP_MPSMAX_SHIFT)
74
+#define NVME_CAP_SET_PMRS(cap, val) (cap |= (uint64_t)(val & CAP_PMR_MASK)\
75
+ << CAP_PMR_SHIFT)
76
77
enum NvmeCcShift {
78
CC_EN_SHIFT = 0,
79
@@ -XXX,XX +XXX,XX @@ enum NvmeCmbszMask {
80
#define NVME_CMBSZ_GETSIZE(cmbsz) \
81
(NVME_CMBSZ_SZ(cmbsz) * (1 << (12 + 4 * NVME_CMBSZ_SZU(cmbsz))))
82
83
+enum NvmePmrcapShift {
84
+ PMRCAP_RDS_SHIFT = 3,
85
+ PMRCAP_WDS_SHIFT = 4,
86
+ PMRCAP_BIR_SHIFT = 5,
87
+ PMRCAP_PMRTU_SHIFT = 8,
88
+ PMRCAP_PMRWBM_SHIFT = 10,
89
+ PMRCAP_PMRTO_SHIFT = 16,
90
+ PMRCAP_CMSS_SHIFT = 24,
91
+};
92
+
93
+enum NvmePmrcapMask {
94
+ PMRCAP_RDS_MASK = 0x1,
95
+ PMRCAP_WDS_MASK = 0x1,
96
+ PMRCAP_BIR_MASK = 0x7,
97
+ PMRCAP_PMRTU_MASK = 0x3,
98
+ PMRCAP_PMRWBM_MASK = 0xf,
99
+ PMRCAP_PMRTO_MASK = 0xff,
100
+ PMRCAP_CMSS_MASK = 0x1,
101
+};
102
+
103
+#define NVME_PMRCAP_RDS(pmrcap) \
104
+ ((pmrcap >> PMRCAP_RDS_SHIFT) & PMRCAP_RDS_MASK)
105
+#define NVME_PMRCAP_WDS(pmrcap) \
106
+ ((pmrcap >> PMRCAP_WDS_SHIFT) & PMRCAP_WDS_MASK)
107
+#define NVME_PMRCAP_BIR(pmrcap) \
108
+ ((pmrcap >> PMRCAP_BIR_SHIFT) & PMRCAP_BIR_MASK)
109
+#define NVME_PMRCAP_PMRTU(pmrcap) \
110
+ ((pmrcap >> PMRCAP_PMRTU_SHIFT) & PMRCAP_PMRTU_MASK)
111
+#define NVME_PMRCAP_PMRWBM(pmrcap) \
112
+ ((pmrcap >> PMRCAP_PMRWBM_SHIFT) & PMRCAP_PMRWBM_MASK)
113
+#define NVME_PMRCAP_PMRTO(pmrcap) \
114
+ ((pmrcap >> PMRCAP_PMRTO_SHIFT) & PMRCAP_PMRTO_MASK)
115
+#define NVME_PMRCAP_CMSS(pmrcap) \
116
+ ((pmrcap >> PMRCAP_CMSS_SHIFT) & PMRCAP_CMSS_MASK)
117
+
118
+#define NVME_PMRCAP_SET_RDS(pmrcap, val) \
119
+ (pmrcap |= (uint64_t)(val & PMRCAP_RDS_MASK) << PMRCAP_RDS_SHIFT)
120
+#define NVME_PMRCAP_SET_WDS(pmrcap, val) \
121
+ (pmrcap |= (uint64_t)(val & PMRCAP_WDS_MASK) << PMRCAP_WDS_SHIFT)
122
+#define NVME_PMRCAP_SET_BIR(pmrcap, val) \
123
+ (pmrcap |= (uint64_t)(val & PMRCAP_BIR_MASK) << PMRCAP_BIR_SHIFT)
124
+#define NVME_PMRCAP_SET_PMRTU(pmrcap, val) \
125
+ (pmrcap |= (uint64_t)(val & PMRCAP_PMRTU_MASK) << PMRCAP_PMRTU_SHIFT)
126
+#define NVME_PMRCAP_SET_PMRWBM(pmrcap, val) \
127
+ (pmrcap |= (uint64_t)(val & PMRCAP_PMRWBM_MASK) << PMRCAP_PMRWBM_SHIFT)
128
+#define NVME_PMRCAP_SET_PMRTO(pmrcap, val) \
129
+ (pmrcap |= (uint64_t)(val & PMRCAP_PMRTO_MASK) << PMRCAP_PMRTO_SHIFT)
130
+#define NVME_PMRCAP_SET_CMSS(pmrcap, val) \
131
+ (pmrcap |= (uint64_t)(val & PMRCAP_CMSS_MASK) << PMRCAP_CMSS_SHIFT)
132
+
133
+enum NvmePmrctlShift {
134
+ PMRCTL_EN_SHIFT = 0,
135
+};
136
+
137
+enum NvmePmrctlMask {
138
+ PMRCTL_EN_MASK = 0x1,
139
+};
140
+
141
+#define NVME_PMRCTL_EN(pmrctl) ((pmrctl >> PMRCTL_EN_SHIFT) & PMRCTL_EN_MASK)
142
+
143
+#define NVME_PMRCTL_SET_EN(pmrctl, val) \
144
+ (pmrctl |= (uint64_t)(val & PMRCTL_EN_MASK) << PMRCTL_EN_SHIFT)
145
+
146
+enum NvmePmrstsShift {
147
+ PMRSTS_ERR_SHIFT = 0,
148
+ PMRSTS_NRDY_SHIFT = 8,
149
+ PMRSTS_HSTS_SHIFT = 9,
150
+ PMRSTS_CBAI_SHIFT = 12,
151
+};
152
+
153
+enum NvmePmrstsMask {
154
+ PMRSTS_ERR_MASK = 0xff,
155
+ PMRSTS_NRDY_MASK = 0x1,
156
+ PMRSTS_HSTS_MASK = 0x7,
157
+ PMRSTS_CBAI_MASK = 0x1,
158
+};
159
+
160
+#define NVME_PMRSTS_ERR(pmrsts) \
161
+ ((pmrsts >> PMRSTS_ERR_SHIFT) & PMRSTS_ERR_MASK)
162
+#define NVME_PMRSTS_NRDY(pmrsts) \
163
+ ((pmrsts >> PMRSTS_NRDY_SHIFT) & PMRSTS_NRDY_MASK)
164
+#define NVME_PMRSTS_HSTS(pmrsts) \
165
+ ((pmrsts >> PMRSTS_HSTS_SHIFT) & PMRSTS_HSTS_MASK)
166
+#define NVME_PMRSTS_CBAI(pmrsts) \
167
+ ((pmrsts >> PMRSTS_CBAI_SHIFT) & PMRSTS_CBAI_MASK)
168
+
169
+#define NVME_PMRSTS_SET_ERR(pmrsts, val) \
170
+ (pmrsts |= (uint64_t)(val & PMRSTS_ERR_MASK) << PMRSTS_ERR_SHIFT)
171
+#define NVME_PMRSTS_SET_NRDY(pmrsts, val) \
172
+ (pmrsts |= (uint64_t)(val & PMRSTS_NRDY_MASK) << PMRSTS_NRDY_SHIFT)
173
+#define NVME_PMRSTS_SET_HSTS(pmrsts, val) \
174
+ (pmrsts |= (uint64_t)(val & PMRSTS_HSTS_MASK) << PMRSTS_HSTS_SHIFT)
175
+#define NVME_PMRSTS_SET_CBAI(pmrsts, val) \
176
+ (pmrsts |= (uint64_t)(val & PMRSTS_CBAI_MASK) << PMRSTS_CBAI_SHIFT)
177
+
178
+enum NvmePmrebsShift {
179
+ PMREBS_PMRSZU_SHIFT = 0,
180
+ PMREBS_RBB_SHIFT = 4,
181
+ PMREBS_PMRWBZ_SHIFT = 8,
182
+};
183
+
184
+enum NvmePmrebsMask {
185
+ PMREBS_PMRSZU_MASK = 0xf,
186
+ PMREBS_RBB_MASK = 0x1,
187
+ PMREBS_PMRWBZ_MASK = 0xffffff,
188
+};
189
+
190
+#define NVME_PMREBS_PMRSZU(pmrebs) \
191
+ ((pmrebs >> PMREBS_PMRSZU_SHIFT) & PMREBS_PMRSZU_MASK)
192
+#define NVME_PMREBS_RBB(pmrebs) \
193
+ ((pmrebs >> PMREBS_RBB_SHIFT) & PMREBS_RBB_MASK)
194
+#define NVME_PMREBS_PMRWBZ(pmrebs) \
195
+ ((pmrebs >> PMREBS_PMRWBZ_SHIFT) & PMREBS_PMRWBZ_MASK)
196
+
197
+#define NVME_PMREBS_SET_PMRSZU(pmrebs, val) \
198
+ (pmrebs |= (uint64_t)(val & PMREBS_PMRSZU_MASK) << PMREBS_PMRSZU_SHIFT)
199
+#define NVME_PMREBS_SET_RBB(pmrebs, val) \
200
+ (pmrebs |= (uint64_t)(val & PMREBS_RBB_MASK) << PMREBS_RBB_SHIFT)
201
+#define NVME_PMREBS_SET_PMRWBZ(pmrebs, val) \
202
+ (pmrebs |= (uint64_t)(val & PMREBS_PMRWBZ_MASK) << PMREBS_PMRWBZ_SHIFT)
203
+
204
+enum NvmePmrswtpShift {
205
+ PMRSWTP_PMRSWTU_SHIFT = 0,
206
+ PMRSWTP_PMRSWTV_SHIFT = 8,
207
+};
208
+
209
+enum NvmePmrswtpMask {
210
+ PMRSWTP_PMRSWTU_MASK = 0xf,
211
+ PMRSWTP_PMRSWTV_MASK = 0xffffff,
212
+};
213
+
214
+#define NVME_PMRSWTP_PMRSWTU(pmrswtp) \
215
+ ((pmrswtp >> PMRSWTP_PMRSWTU_SHIFT) & PMRSWTP_PMRSWTU_MASK)
216
+#define NVME_PMRSWTP_PMRSWTV(pmrswtp) \
217
+ ((pmrswtp >> PMRSWTP_PMRSWTV_SHIFT) & PMRSWTP_PMRSWTV_MASK)
218
+
219
+#define NVME_PMRSWTP_SET_PMRSWTU(pmrswtp, val) \
220
+ (pmrswtp |= (uint64_t)(val & PMRSWTP_PMRSWTU_MASK) << PMRSWTP_PMRSWTU_SHIFT)
221
+#define NVME_PMRSWTP_SET_PMRSWTV(pmrswtp, val) \
222
+ (pmrswtp |= (uint64_t)(val & PMRSWTP_PMRSWTV_MASK) << PMRSWTP_PMRSWTV_SHIFT)
223
+
224
+enum NvmePmrmscShift {
225
+ PMRMSC_CMSE_SHIFT = 1,
226
+ PMRMSC_CBA_SHIFT = 12,
227
+};
228
+
229
+enum NvmePmrmscMask {
230
+ PMRMSC_CMSE_MASK = 0x1,
231
+ PMRMSC_CBA_MASK = 0xfffffffffffff,
232
+};
233
+
234
+#define NVME_PMRMSC_CMSE(pmrmsc) \
235
+ ((pmrmsc >> PMRMSC_CMSE_SHIFT) & PMRMSC_CMSE_MASK)
236
+#define NVME_PMRMSC_CBA(pmrmsc) \
237
+ ((pmrmsc >> PMRMSC_CBA_SHIFT) & PMRMSC_CBA_MASK)
238
+
239
+#define NVME_PMRMSC_SET_CMSE(pmrmsc, val) \
240
+ (pmrmsc |= (uint64_t)(val & PMRMSC_CMSE_MASK) << PMRMSC_CMSE_SHIFT)
241
+#define NVME_PMRMSC_SET_CBA(pmrmsc, val) \
242
+ (pmrmsc |= (uint64_t)(val & PMRMSC_CBA_MASK) << PMRMSC_CBA_SHIFT)
243
+
244
typedef struct NvmeCmd {
245
uint8_t opcode;
246
uint8_t fuse;
247
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
248
index XXXXXXX..XXXXXXX 100644
249
--- a/hw/block/nvme.c
250
+++ b/hw/block/nvme.c
251
@@ -XXX,XX +XXX,XX @@
252
* -drive file=<file>,if=none,id=<drive_id>
253
* -device nvme,drive=<drive_id>,serial=<serial>,id=<id[optional]>, \
254
* cmb_size_mb=<cmb_size_mb[optional]>, \
255
+ * [pmrdev=<mem_backend_file_id>,] \
256
* num_queues=<N[optional]>
32
*
257
*
33
* Returns: compressed size on success
258
* Note cmb_size_mb denotes size of CMB in MB. CMB is assumed to be at
34
- * -1 destination buffer is not enough to store compressed data
259
* offset 0 in BAR2 and supports only WDS, RDS and SQS for now.
35
- * -2 on any other error
260
+ *
36
+ * -ENOMEM destination buffer is not enough to store compressed data
261
+ * cmb_size_mb= and pmrdev= options are mutually exclusive due to limitation
37
+ * -EIO on any other error
262
+ * in available BAR's. cmb_size_mb= will take precedence over pmrdev= when
263
+ * both provided.
264
+ * Enabling pmr emulation can be achieved by pointing to memory-backend-file.
265
+ * For example:
266
+ * -object memory-backend-file,id=<mem_id>,share=on,mem-path=<file_path>, \
267
+ * size=<size> .... -device nvme,...,pmrdev=<mem_id>
38
*/
268
*/
39
static ssize_t qcow2_compress(void *dest, size_t dest_size,
269
40
const void *src, size_t src_size)
270
#include "qemu/osdep.h"
41
@@ -XXX,XX +XXX,XX @@ static ssize_t qcow2_compress(void *dest, size_t dest_size,
271
@@ -XXX,XX +XXX,XX @@
42
ret = deflateInit2(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED,
272
#include "sysemu/sysemu.h"
43
-12, 9, Z_DEFAULT_STRATEGY);
273
#include "qapi/error.h"
44
if (ret != Z_OK) {
274
#include "qapi/visitor.h"
45
- return -2;
275
+#include "sysemu/hostmem.h"
46
+ return -EIO;
276
#include "sysemu/block-backend.h"
277
+#include "exec/ram_addr.h"
278
279
#include "qemu/log.h"
280
#include "qemu/module.h"
281
@@ -XXX,XX +XXX,XX @@ static void nvme_write_bar(NvmeCtrl *n, hwaddr offset, uint64_t data,
282
NVME_GUEST_ERR(nvme_ub_mmiowr_cmbsz_readonly,
283
"invalid write to read only CMBSZ, ignored");
284
return;
285
+ case 0xE00: /* PMRCAP */
286
+ NVME_GUEST_ERR(nvme_ub_mmiowr_pmrcap_readonly,
287
+ "invalid write to PMRCAP register, ignored");
288
+ return;
289
+ case 0xE04: /* TODO PMRCTL */
290
+ break;
291
+ case 0xE08: /* PMRSTS */
292
+ NVME_GUEST_ERR(nvme_ub_mmiowr_pmrsts_readonly,
293
+ "invalid write to PMRSTS register, ignored");
294
+ return;
295
+ case 0xE0C: /* PMREBS */
296
+ NVME_GUEST_ERR(nvme_ub_mmiowr_pmrebs_readonly,
297
+ "invalid write to PMREBS register, ignored");
298
+ return;
299
+ case 0xE10: /* PMRSWTP */
300
+ NVME_GUEST_ERR(nvme_ub_mmiowr_pmrswtp_readonly,
301
+ "invalid write to PMRSWTP register, ignored");
302
+ return;
303
+ case 0xE14: /* TODO PMRMSC */
304
+ break;
305
default:
306
NVME_GUEST_ERR(nvme_ub_mmiowr_invalid,
307
"invalid MMIO write,"
308
@@ -XXX,XX +XXX,XX @@ static uint64_t nvme_mmio_read(void *opaque, hwaddr addr, unsigned size)
47
}
309
}
48
310
49
/* strm.next_in is not const in old zlib versions, such as those used on
311
if (addr < sizeof(n->bar)) {
50
@@ -XXX,XX +XXX,XX @@ static ssize_t qcow2_compress(void *dest, size_t dest_size,
312
+ /*
51
if (ret == Z_STREAM_END) {
313
+ * When PMRWBM bit 1 is set then read from
52
ret = dest_size - strm.avail_out;
314
+ * from PMRSTS should ensure prior writes
315
+ * made it to persistent media
316
+ */
317
+ if (addr == 0xE08 &&
318
+ (NVME_PMRCAP_PMRWBM(n->bar.pmrcap) & 0x02)) {
319
+ qemu_ram_writeback(n->pmrdev->mr.ram_block,
320
+ 0, n->pmrdev->size);
321
+ }
322
memcpy(&val, ptr + addr, size);
53
} else {
323
} else {
54
- ret = (ret == Z_OK ? -1 : -2);
324
NVME_GUEST_ERR(nvme_ub_mmiord_invalid_ofs,
55
+ ret = (ret == Z_OK ? -ENOMEM : -EIO);
325
@@ -XXX,XX +XXX,XX @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)
326
error_setg(errp, "serial property not set");
327
return;
56
}
328
}
57
329
+
58
deflateEnd(&strm);
330
+ if (!n->cmb_size_mb && n->pmrdev) {
59
@@ -XXX,XX +XXX,XX @@ qcow2_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset,
331
+ if (host_memory_backend_is_mapped(n->pmrdev)) {
60
BDRVQcow2State *s = bs->opaque;
332
+ char *path = object_get_canonical_path_component(OBJECT(n->pmrdev));
61
QEMUIOVector hd_qiov;
333
+ error_setg(errp, "can't use already busy memdev: %s", path);
62
int ret;
334
+ g_free(path);
63
- size_t out_len;
335
+ return;
64
+ ssize_t out_len;
336
+ }
65
uint8_t *buf, *out_buf;
337
+
66
uint64_t cluster_offset;
338
+ if (!is_power_of_2(n->pmrdev->size)) {
67
339
+ error_setg(errp, "pmr backend size needs to be power of 2 in size");
68
@@ -XXX,XX +XXX,XX @@ qcow2_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset,
340
+ return;
69
341
+ }
70
out_len = qcow2_co_compress(bs, out_buf, s->cluster_size - 1,
342
+
71
buf, s->cluster_size);
343
+ host_memory_backend_set_mapped(n->pmrdev, true);
72
- if (out_len == -2) {
344
+ }
73
- ret = -EINVAL;
345
+
74
- goto fail;
346
blkconf_blocksizes(&n->conf);
75
- } else if (out_len == -1) {
347
if (!blkconf_apply_backend_options(&n->conf, blk_is_read_only(n->conf.blk),
76
+ if (out_len == -ENOMEM) {
348
false, errp)) {
77
/* could not compress: write normal cluster */
349
@@ -XXX,XX +XXX,XX @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)
78
ret = qcow2_co_pwritev(bs, offset, bytes, qiov, 0);
350
PCI_BASE_ADDRESS_SPACE_MEMORY | PCI_BASE_ADDRESS_MEM_TYPE_64 |
79
if (ret < 0) {
351
PCI_BASE_ADDRESS_MEM_PREFETCH, &n->ctrl_mem);
80
goto fail;
352
81
}
353
+ } else if (n->pmrdev) {
82
goto success;
354
+ /* Controller Capabilities register */
83
+ } else if (out_len < 0) {
355
+ NVME_CAP_SET_PMRS(n->bar.cap, 1);
84
+ ret = -EINVAL;
356
+
85
+ goto fail;
357
+ /* PMR Capabities register */
358
+ n->bar.pmrcap = 0;
359
+ NVME_PMRCAP_SET_RDS(n->bar.pmrcap, 0);
360
+ NVME_PMRCAP_SET_WDS(n->bar.pmrcap, 0);
361
+ NVME_PMRCAP_SET_BIR(n->bar.pmrcap, 2);
362
+ NVME_PMRCAP_SET_PMRTU(n->bar.pmrcap, 0);
363
+ /* Turn on bit 1 support */
364
+ NVME_PMRCAP_SET_PMRWBM(n->bar.pmrcap, 0x02);
365
+ NVME_PMRCAP_SET_PMRTO(n->bar.pmrcap, 0);
366
+ NVME_PMRCAP_SET_CMSS(n->bar.pmrcap, 0);
367
+
368
+ /* PMR Control register */
369
+ n->bar.pmrctl = 0;
370
+ NVME_PMRCTL_SET_EN(n->bar.pmrctl, 0);
371
+
372
+ /* PMR Status register */
373
+ n->bar.pmrsts = 0;
374
+ NVME_PMRSTS_SET_ERR(n->bar.pmrsts, 0);
375
+ NVME_PMRSTS_SET_NRDY(n->bar.pmrsts, 0);
376
+ NVME_PMRSTS_SET_HSTS(n->bar.pmrsts, 0);
377
+ NVME_PMRSTS_SET_CBAI(n->bar.pmrsts, 0);
378
+
379
+ /* PMR Elasticity Buffer Size register */
380
+ n->bar.pmrebs = 0;
381
+ NVME_PMREBS_SET_PMRSZU(n->bar.pmrebs, 0);
382
+ NVME_PMREBS_SET_RBB(n->bar.pmrebs, 0);
383
+ NVME_PMREBS_SET_PMRWBZ(n->bar.pmrebs, 0);
384
+
385
+ /* PMR Sustained Write Throughput register */
386
+ n->bar.pmrswtp = 0;
387
+ NVME_PMRSWTP_SET_PMRSWTU(n->bar.pmrswtp, 0);
388
+ NVME_PMRSWTP_SET_PMRSWTV(n->bar.pmrswtp, 0);
389
+
390
+ /* PMR Memory Space Control register */
391
+ n->bar.pmrmsc = 0;
392
+ NVME_PMRMSC_SET_CMSE(n->bar.pmrmsc, 0);
393
+ NVME_PMRMSC_SET_CBA(n->bar.pmrmsc, 0);
394
+
395
+ pci_register_bar(pci_dev, NVME_PMRCAP_BIR(n->bar.pmrcap),
396
+ PCI_BASE_ADDRESS_SPACE_MEMORY | PCI_BASE_ADDRESS_MEM_TYPE_64 |
397
+ PCI_BASE_ADDRESS_MEM_PREFETCH, &n->pmrdev->mr);
86
}
398
}
87
399
88
qemu_co_mutex_lock(&s->lock);
400
for (i = 0; i < n->num_namespaces; i++) {
401
@@ -XXX,XX +XXX,XX @@ static void nvme_exit(PCIDevice *pci_dev)
402
if (n->cmb_size_mb) {
403
g_free(n->cmbuf);
404
}
405
+
406
+ if (n->pmrdev) {
407
+ host_memory_backend_set_mapped(n->pmrdev, false);
408
+ }
409
msix_uninit_exclusive_bar(pci_dev);
410
}
411
412
static Property nvme_props[] = {
413
DEFINE_BLOCK_PROPERTIES(NvmeCtrl, conf),
414
+ DEFINE_PROP_LINK("pmrdev", NvmeCtrl, pmrdev, TYPE_MEMORY_BACKEND,
415
+ HostMemoryBackend *),
416
DEFINE_PROP_STRING("serial", NvmeCtrl, serial),
417
DEFINE_PROP_UINT32("cmb_size_mb", NvmeCtrl, cmb_size_mb, 0),
418
DEFINE_PROP_UINT32("num_queues", NvmeCtrl, num_queues, 64),
419
diff --git a/hw/block/Makefile.objs b/hw/block/Makefile.objs
420
index XXXXXXX..XXXXXXX 100644
421
--- a/hw/block/Makefile.objs
422
+++ b/hw/block/Makefile.objs
423
@@ -XXX,XX +XXX,XX @@ common-obj-$(CONFIG_PFLASH_CFI02) += pflash_cfi02.o
424
common-obj-$(CONFIG_XEN) += xen-block.o
425
common-obj-$(CONFIG_ECC) += ecc.o
426
common-obj-$(CONFIG_ONENAND) += onenand.o
427
-common-obj-$(CONFIG_NVME_PCI) += nvme.o
428
common-obj-$(CONFIG_SWIM) += swim.o
429
430
common-obj-$(CONFIG_SH4) += tc58128.o
431
432
obj-$(CONFIG_VIRTIO_BLK) += virtio-blk.o
433
obj-$(CONFIG_VHOST_USER_BLK) += vhost-user-blk.o
434
+obj-$(CONFIG_NVME_PCI) += nvme.o
435
436
obj-y += dataplane/
437
diff --git a/hw/block/trace-events b/hw/block/trace-events
438
index XXXXXXX..XXXXXXX 100644
439
--- a/hw/block/trace-events
440
+++ b/hw/block/trace-events
441
@@ -XXX,XX +XXX,XX @@ nvme_ub_mmiowr_ssreset_w1c_unsupported(void) "attempted to W1C CSTS.NSSRO but CA
442
nvme_ub_mmiowr_ssreset_unsupported(void) "attempted NVM subsystem reset but CAP.NSSRS is zero (not supported)"
443
nvme_ub_mmiowr_cmbloc_reserved(void) "invalid write to reserved CMBLOC when CMBSZ is zero, ignored"
444
nvme_ub_mmiowr_cmbsz_readonly(void) "invalid write to read only CMBSZ, ignored"
445
+nvme_ub_mmiowr_pmrcap_readonly(void) "invalid write to read only PMRCAP, ignored"
446
+nvme_ub_mmiowr_pmrsts_readonly(void) "invalid write to read only PMRSTS, ignored"
447
+nvme_ub_mmiowr_pmrebs_readonly(void) "invalid write to read only PMREBS, ignored"
448
+nvme_ub_mmiowr_pmrswtp_readonly(void) "invalid write to read only PMRSWTP, ignored"
449
nvme_ub_mmiowr_invalid(uint64_t offset, uint64_t data) "invalid MMIO write, offset=0x%"PRIx64", data=0x%"PRIx64""
450
nvme_ub_mmiord_misaligned32(uint64_t offset) "MMIO read not 32-bit aligned, offset=0x%"PRIx64""
451
nvme_ub_mmiord_toosmall(uint64_t offset) "MMIO read smaller than 32-bits, offset=0x%"PRIx64""
89
--
452
--
90
2.20.1
453
2.25.3
91
454
92
455
diff view generated by jsdifflib
1
From: Max Reitz <mreitz@redhat.com>
1
The QMP handler qmp_object_add() and the implementation of --object in
2
qemu-storage-daemon can share most of the code. Currently,
3
qemu-storage-daemon calls qmp_object_add(), but this is not correct
4
because different visitors need to be used.
2
5
3
qemu-img create allows giving just a format and "-o help" to get a list
6
As a first step towards a fix, make qmp_object_add() a wrapper around a
4
of the options supported by that format. Users may not realize that the
7
new function user_creatable_add_dict() that can get an additional
5
protocol level may offer even more options, which they only get to see
8
parameter. The handling of "props" is only required for compatibility
6
by specifying a filename.
9
and not required for the qemu-storage-daemon command line, so it stays
10
in qmp_object_add().
7
11
8
This patch adds a note to hint at that fact.
9
10
Signed-off-by: Max Reitz <mreitz@redhat.com>
11
Reviewed-by: John Snow <jsnow@redhat.com>
12
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
12
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
13
---
13
---
14
qemu-img.c | 13 ++++++++++++-
14
include/qom/object_interfaces.h | 12 ++++++++++++
15
tests/qemu-iotests/082.out | 20 ++++++++++++++++----
15
qom/object_interfaces.c | 27 +++++++++++++++++++++++++++
16
2 files changed, 28 insertions(+), 5 deletions(-)
16
qom/qom-qmp-cmds.c | 24 +-----------------------
17
3 files changed, 40 insertions(+), 23 deletions(-)
17
18
18
diff --git a/qemu-img.c b/qemu-img.c
19
diff --git a/include/qom/object_interfaces.h b/include/qom/object_interfaces.h
19
index XXXXXXX..XXXXXXX 100644
20
index XXXXXXX..XXXXXXX 100644
20
--- a/qemu-img.c
21
--- a/include/qom/object_interfaces.h
21
+++ b/qemu-img.c
22
+++ b/include/qom/object_interfaces.h
22
@@ -XXX,XX +XXX,XX @@ static int print_block_option_help(const char *filename, const char *fmt)
23
@@ -XXX,XX +XXX,XX @@ Object *user_creatable_add_type(const char *type, const char *id,
23
create_opts = qemu_opts_append(create_opts, proto_drv->create_opts);
24
const QDict *qdict,
25
Visitor *v, Error **errp);
26
27
+/**
28
+ * user_creatable_add_dict:
29
+ * @qdict: the object definition
30
+ * @errp: if an error occurs, a pointer to an area to store the error
31
+ *
32
+ * Create an instance of the user creatable object that is defined by
33
+ * @qdict. The object type is taken from the QDict key 'qom-type', its
34
+ * ID from the key 'id'. The remaining entries in @qdict are used to
35
+ * initialize the object properties.
36
+ */
37
+void user_creatable_add_dict(QDict *qdict, Error **errp);
38
+
39
/**
40
* user_creatable_add_opts:
41
* @opts: the object definition
42
diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c
43
index XXXXXXX..XXXXXXX 100644
44
--- a/qom/object_interfaces.c
45
+++ b/qom/object_interfaces.c
46
@@ -XXX,XX +XXX,XX @@
47
#include "qapi/qmp/qerror.h"
48
#include "qapi/qmp/qjson.h"
49
#include "qapi/qmp/qstring.h"
50
+#include "qapi/qobject-input-visitor.h"
51
#include "qom/object_interfaces.h"
52
#include "qemu/help_option.h"
53
#include "qemu/module.h"
54
@@ -XXX,XX +XXX,XX @@ out:
55
return obj;
56
}
57
58
+void user_creatable_add_dict(QDict *qdict, Error **errp)
59
+{
60
+ Visitor *v;
61
+ Object *obj;
62
+ g_autofree char *type = NULL;
63
+ g_autofree char *id = NULL;
64
+
65
+ type = g_strdup(qdict_get_try_str(qdict, "qom-type"));
66
+ if (!type) {
67
+ error_setg(errp, QERR_MISSING_PARAMETER, "qom-type");
68
+ return;
69
+ }
70
+ qdict_del(qdict, "qom-type");
71
+
72
+ id = g_strdup(qdict_get_try_str(qdict, "id"));
73
+ if (!id) {
74
+ error_setg(errp, QERR_MISSING_PARAMETER, "id");
75
+ return;
76
+ }
77
+ qdict_del(qdict, "id");
78
+
79
+ v = qobject_input_visitor_new(QOBJECT(qdict));
80
+ obj = user_creatable_add_type(type, id, qdict, v, errp);
81
+ visit_free(v);
82
+ object_unref(obj);
83
+}
84
85
Object *user_creatable_add_opts(QemuOpts *opts, Error **errp)
86
{
87
diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c
88
index XXXXXXX..XXXXXXX 100644
89
--- a/qom/qom-qmp-cmds.c
90
+++ b/qom/qom-qmp-cmds.c
91
@@ -XXX,XX +XXX,XX @@
92
#include "qapi/qapi-commands-qom.h"
93
#include "qapi/qmp/qdict.h"
94
#include "qapi/qmp/qerror.h"
95
-#include "qapi/qobject-input-visitor.h"
96
#include "qemu/cutils.h"
97
#include "qom/object_interfaces.h"
98
#include "qom/qom-qobject.h"
99
@@ -XXX,XX +XXX,XX @@ void qmp_object_add(QDict *qdict, QObject **ret_data, Error **errp)
100
{
101
QObject *props;
102
QDict *pdict;
103
- Visitor *v;
104
- Object *obj;
105
- g_autofree char *type = NULL;
106
- g_autofree char *id = NULL;
107
-
108
- type = g_strdup(qdict_get_try_str(qdict, "qom-type"));
109
- if (!type) {
110
- error_setg(errp, QERR_MISSING_PARAMETER, "qom-type");
111
- return;
112
- }
113
- qdict_del(qdict, "qom-type");
114
-
115
- id = g_strdup(qdict_get_try_str(qdict, "id"));
116
- if (!id) {
117
- error_setg(errp, QERR_MISSING_PARAMETER, "id");
118
- return;
119
- }
120
- qdict_del(qdict, "id");
121
122
props = qdict_get(qdict, "props");
123
if (props) {
124
@@ -XXX,XX +XXX,XX @@ void qmp_object_add(QDict *qdict, QObject **ret_data, Error **errp)
125
qobject_unref(pdict);
24
}
126
}
25
127
26
- printf("Supported options:\n");
128
- v = qobject_input_visitor_new(QOBJECT(qdict));
27
+ if (filename) {
129
- obj = user_creatable_add_type(type, id, qdict, v, errp);
28
+ printf("Supported options:\n");
130
- visit_free(v);
29
+ } else {
131
- object_unref(obj);
30
+ printf("Supported %s options:\n", fmt);
132
+ user_creatable_add_dict(qdict, errp);
31
+ }
32
qemu_opts_print_help(create_opts, false);
33
qemu_opts_free(create_opts);
34
+
35
+ if (!filename) {
36
+ printf("\n"
37
+ "The protocol level may support further options.\n"
38
+ "Specify the target filename to include those options.\n");
39
+ }
40
+
41
return 0;
42
}
133
}
43
134
44
diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out
135
void qmp_object_del(const char *id, Error **errp)
45
index XXXXXXX..XXXXXXX 100644
46
--- a/tests/qemu-iotests/082.out
47
+++ b/tests/qemu-iotests/082.out
48
@@ -XXX,XX +XXX,XX @@ Testing: create -f qcow2 -o backing_file=TEST_DIR/t.qcow2 -o ,, -o help TEST_DIR
49
qemu-img: Invalid option list: ,,
50
51
Testing: create -f qcow2 -o help
52
-Supported options:
53
+Supported qcow2 options:
54
backing_file=<str> - File name of a base image
55
backing_fmt=<str> - Image format of the base image
56
cluster_size=<size> - qcow2 cluster size
57
@@ -XXX,XX +XXX,XX @@ Supported options:
58
refcount_bits=<num> - Width of a reference count entry in bits
59
size=<size> - Virtual disk size
60
61
+The protocol level may support further options.
62
+Specify the target filename to include those options.
63
+
64
Testing: create -o help
65
-Supported options:
66
+Supported raw options:
67
size=<size> - Virtual disk size
68
69
+The protocol level may support further options.
70
+Specify the target filename to include those options.
71
+
72
Testing: create -f bochs -o help
73
qemu-img: Format driver 'bochs' does not support image creation
74
75
@@ -XXX,XX +XXX,XX @@ Testing: convert -O qcow2 -o backing_file=TEST_DIR/t.qcow2 -o ,, -o help TEST_DI
76
qemu-img: Invalid option list: ,,
77
78
Testing: convert -O qcow2 -o help
79
-Supported options:
80
+Supported qcow2 options:
81
backing_file=<str> - File name of a base image
82
backing_fmt=<str> - Image format of the base image
83
cluster_size=<size> - qcow2 cluster size
84
@@ -XXX,XX +XXX,XX @@ Supported options:
85
refcount_bits=<num> - Width of a reference count entry in bits
86
size=<size> - Virtual disk size
87
88
+The protocol level may support further options.
89
+Specify the target filename to include those options.
90
+
91
Testing: convert -o help
92
-Supported options:
93
+Supported raw options:
94
size=<size> - Virtual disk size
95
96
+The protocol level may support further options.
97
+Specify the target filename to include those options.
98
+
99
Testing: convert -O bochs -o help
100
qemu-img: Format driver 'bochs' does not support image creation
101
102
--
136
--
103
2.20.1
137
2.25.3
104
138
105
139
diff view generated by jsdifflib
Deleted patch
1
make_completely_empty() is an optimisated path for bdrv_make_empty()
2
where completely new metadata is created inside the image file instead
3
of going through all clusters and discarding them. For an external data
4
file, however, we actually need to do discard operations on the data
5
file; just overwriting the qcow2 file doesn't get rid of the data.
6
1
7
The necessary slow path with an explicit discard operation already
8
exists for other cases. Use it for external data files, too.
9
10
Cc: qemu-stable@nongnu.org
11
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
12
Reviewed-by: Eric Blake <eblake@redhat.com>
13
---
14
block/qcow2.c | 7 +++++--
15
1 file changed, 5 insertions(+), 2 deletions(-)
16
17
diff --git a/block/qcow2.c b/block/qcow2.c
18
index XXXXXXX..XXXXXXX 100644
19
--- a/block/qcow2.c
20
+++ b/block/qcow2.c
21
@@ -XXX,XX +XXX,XX @@ static int qcow2_make_empty(BlockDriverState *bs)
22
23
if (s->qcow_version >= 3 && !s->snapshots && !s->nb_bitmaps &&
24
3 + l1_clusters <= s->refcount_block_size &&
25
- s->crypt_method_header != QCOW_CRYPT_LUKS) {
26
+ s->crypt_method_header != QCOW_CRYPT_LUKS &&
27
+ !has_data_file(bs)) {
28
/* The following function only works for qcow2 v3 images (it
29
* requires the dirty flag) and only as long as there are no
30
* features that reserve extra clusters (such as snapshots,
31
* LUKS header, or persistent bitmaps), because it completely
32
* empties the image. Furthermore, the L1 table and three
33
* additional clusters (image header, refcount table, one
34
- * refcount block) have to fit inside one refcount block. */
35
+ * refcount block) have to fit inside one refcount block. It
36
+ * only resets the image file, i.e. does not work with an
37
+ * external data file. */
38
return make_completely_empty(bs);
39
}
40
41
--
42
2.20.1
43
44
diff view generated by jsdifflib
Deleted patch
1
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
2
1
3
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
4
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
5
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
6
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
7
---
8
block/qcow.c | 19 ++++++-------------
9
1 file changed, 6 insertions(+), 13 deletions(-)
10
11
diff --git a/block/qcow.c b/block/qcow.c
12
index XXXXXXX..XXXXXXX 100644
13
--- a/block/qcow.c
14
+++ b/block/qcow.c
15
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_preadv(BlockDriverState *bs, uint64_t offset,
16
int offset_in_cluster;
17
int ret = 0, n;
18
uint64_t cluster_offset;
19
- QEMUIOVector hd_qiov;
20
uint8_t *buf;
21
void *orig_buf;
22
23
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_preadv(BlockDriverState *bs, uint64_t offset,
24
if (!cluster_offset) {
25
if (bs->backing) {
26
/* read from the base image */
27
- qemu_iovec_init_buf(&hd_qiov, buf, n);
28
qemu_co_mutex_unlock(&s->lock);
29
/* qcow2 emits this on bs->file instead of bs->backing */
30
BLKDBG_EVENT(bs->file, BLKDBG_READ_BACKING_AIO);
31
- ret = bdrv_co_preadv(bs->backing, offset, n, &hd_qiov, 0);
32
+ ret = bdrv_co_pread(bs->backing, offset, n, buf, 0);
33
qemu_co_mutex_lock(&s->lock);
34
if (ret < 0) {
35
break;
36
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_preadv(BlockDriverState *bs, uint64_t offset,
37
ret = -EIO;
38
break;
39
}
40
- qemu_iovec_init_buf(&hd_qiov, buf, n);
41
qemu_co_mutex_unlock(&s->lock);
42
BLKDBG_EVENT(bs->file, BLKDBG_READ_AIO);
43
- ret = bdrv_co_preadv(bs->file, cluster_offset + offset_in_cluster,
44
- n, &hd_qiov, 0);
45
+ ret = bdrv_co_pread(bs->file, cluster_offset + offset_in_cluster,
46
+ n, buf, 0);
47
qemu_co_mutex_lock(&s->lock);
48
if (ret < 0) {
49
break;
50
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_pwritev(BlockDriverState *bs, uint64_t offset,
51
int offset_in_cluster;
52
uint64_t cluster_offset;
53
int ret = 0, n;
54
- QEMUIOVector hd_qiov;
55
uint8_t *buf;
56
void *orig_buf;
57
58
@@ -XXX,XX +XXX,XX @@ static coroutine_fn int qcow_co_pwritev(BlockDriverState *bs, uint64_t offset,
59
}
60
}
61
62
- qemu_iovec_init_buf(&hd_qiov, buf, n);
63
qemu_co_mutex_unlock(&s->lock);
64
BLKDBG_EVENT(bs->file, BLKDBG_WRITE_AIO);
65
- ret = bdrv_co_pwritev(bs->file, cluster_offset + offset_in_cluster,
66
- n, &hd_qiov, 0);
67
+ ret = bdrv_co_pwrite(bs->file, cluster_offset + offset_in_cluster,
68
+ n, buf, 0);
69
qemu_co_mutex_lock(&s->lock);
70
if (ret < 0) {
71
break;
72
@@ -XXX,XX +XXX,XX @@ qcow_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset,
73
uint64_t bytes, QEMUIOVector *qiov)
74
{
75
BDRVQcowState *s = bs->opaque;
76
- QEMUIOVector hd_qiov;
77
z_stream strm;
78
int ret, out_len;
79
uint8_t *buf, *out_buf;
80
@@ -XXX,XX +XXX,XX @@ qcow_co_pwritev_compressed(BlockDriverState *bs, uint64_t offset,
81
}
82
cluster_offset &= s->cluster_offset_mask;
83
84
- qemu_iovec_init_buf(&hd_qiov, out_buf, out_len);
85
BLKDBG_EVENT(bs->file, BLKDBG_WRITE_COMPRESSED);
86
- ret = bdrv_co_pwritev(bs->file, cluster_offset, out_len, &hd_qiov, 0);
87
+ ret = bdrv_co_pwrite(bs->file, cluster_offset, out_len, out_buf, 0);
88
if (ret < 0) {
89
goto fail;
90
}
91
--
92
2.20.1
93
94
diff view generated by jsdifflib
Deleted patch
1
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
2
1
3
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
4
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
5
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
6
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
7
---
8
block/parallels.c | 14 ++++++--------
9
1 file changed, 6 insertions(+), 8 deletions(-)
10
11
diff --git a/block/parallels.c b/block/parallels.c
12
index XXXXXXX..XXXXXXX 100644
13
--- a/block/parallels.c
14
+++ b/block/parallels.c
15
@@ -XXX,XX +XXX,XX @@ static int64_t allocate_clusters(BlockDriverState *bs, int64_t sector_num,
16
if (bs->backing) {
17
int64_t nb_cow_sectors = to_allocate * s->tracks;
18
int64_t nb_cow_bytes = nb_cow_sectors << BDRV_SECTOR_BITS;
19
- QEMUIOVector qiov =
20
- QEMU_IOVEC_INIT_BUF(qiov, qemu_blockalign(bs, nb_cow_bytes),
21
- nb_cow_bytes);
22
+ void *buf = qemu_blockalign(bs, nb_cow_bytes);
23
24
- ret = bdrv_co_preadv(bs->backing, idx * s->tracks * BDRV_SECTOR_SIZE,
25
- nb_cow_bytes, &qiov, 0);
26
+ ret = bdrv_co_pread(bs->backing, idx * s->tracks * BDRV_SECTOR_SIZE,
27
+ nb_cow_bytes, buf, 0);
28
if (ret < 0) {
29
- qemu_vfree(qemu_iovec_buf(&qiov));
30
+ qemu_vfree(buf);
31
return ret;
32
}
33
34
ret = bdrv_co_pwritev(bs->file, s->data_end * BDRV_SECTOR_SIZE,
35
- nb_cow_bytes, &qiov, 0);
36
- qemu_vfree(qemu_iovec_buf(&qiov));
37
+ nb_cow_bytes, buf, 0);
38
+ qemu_vfree(buf);
39
if (ret < 0) {
40
return ret;
41
}
42
--
43
2.20.1
44
45
diff view generated by jsdifflib
Deleted patch
1
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
2
1
3
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
4
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
5
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
6
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
7
---
8
block/backup.c | 14 ++++++--------
9
1 file changed, 6 insertions(+), 8 deletions(-)
10
11
diff --git a/block/backup.c b/block/backup.c
12
index XXXXXXX..XXXXXXX 100644
13
--- a/block/backup.c
14
+++ b/block/backup.c
15
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_cow_with_bounce_buffer(BackupBlockJob *job,
16
void **bounce_buffer)
17
{
18
int ret;
19
- QEMUIOVector qiov;
20
BlockBackend *blk = job->common.blk;
21
int nbytes;
22
int read_flags = is_write_notifier ? BDRV_REQ_NO_SERIALISING : 0;
23
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_cow_with_bounce_buffer(BackupBlockJob *job,
24
if (!*bounce_buffer) {
25
*bounce_buffer = blk_blockalign(blk, job->cluster_size);
26
}
27
- qemu_iovec_init_buf(&qiov, *bounce_buffer, nbytes);
28
29
- ret = blk_co_preadv(blk, start, qiov.size, &qiov, read_flags);
30
+ ret = blk_co_pread(blk, start, nbytes, *bounce_buffer, read_flags);
31
if (ret < 0) {
32
trace_backup_do_cow_read_fail(job, start, ret);
33
if (error_is_read) {
34
@@ -XXX,XX +XXX,XX @@ static int coroutine_fn backup_cow_with_bounce_buffer(BackupBlockJob *job,
35
goto fail;
36
}
37
38
- if (qemu_iovec_is_zero(&qiov)) {
39
+ if (buffer_is_zero(*bounce_buffer, nbytes)) {
40
ret = blk_co_pwrite_zeroes(job->target, start,
41
- qiov.size, write_flags | BDRV_REQ_MAY_UNMAP);
42
+ nbytes, write_flags | BDRV_REQ_MAY_UNMAP);
43
} else {
44
- ret = blk_co_pwritev(job->target, start,
45
- qiov.size, &qiov, write_flags |
46
- (job->compress ? BDRV_REQ_WRITE_COMPRESSED : 0));
47
+ ret = blk_co_pwrite(job->target, start,
48
+ nbytes, *bounce_buffer, write_flags |
49
+ (job->compress ? BDRV_REQ_WRITE_COMPRESSED : 0));
50
}
51
if (ret < 0) {
52
trace_backup_do_cow_write_fail(job, start, ret);
53
--
54
2.20.1
55
56
diff view generated by jsdifflib
1
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
1
After processing the option string with the keyval parser, we get a
2
QDict that contains only strings. This QDict must be fed to a keyval
3
visitor which converts the strings into the right data types.
2
4
3
qed_read_table and qed_write_table use coroutine-only interfaces but
5
qmp_object_add(), however, uses the normal QObject input visitor, which
4
are not marked coroutine_fn. Happily, they are called only from
6
expects a QDict where all properties already have the QType that matches
5
coroutine context, so we only need to add missed markers.
7
the data type required by the QOM object type.
6
8
7
Reported-by: Kevin Wolf <kwolf@redhat.com>
9
Change the --object implementation in qemu-storage-daemon so that it
8
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
10
doesn't call qmp_object_add(), but calls user_creatable_add_dict()
11
directly instead and pass it a new keyval boolean that decides which
12
visitor must be used.
13
14
Reported-by: Coiby Xu <coiby.xu@gmail.com>
9
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
15
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
10
---
16
---
11
block/qed.h | 28 ++++++++++++++++------------
17
include/qom/object_interfaces.h | 6 +++++-
12
block/qed-check.c | 4 ++--
18
qemu-storage-daemon.c | 4 +---
13
block/qed-table.c | 33 ++++++++++++++++++++-------------
19
qom/object_interfaces.c | 8 ++++++--
14
block/qed.c | 5 +++--
20
qom/qom-qmp-cmds.c | 2 +-
15
4 files changed, 41 insertions(+), 29 deletions(-)
21
4 files changed, 13 insertions(+), 7 deletions(-)
16
22
17
diff --git a/block/qed.h b/block/qed.h
23
diff --git a/include/qom/object_interfaces.h b/include/qom/object_interfaces.h
18
index XXXXXXX..XXXXXXX 100644
24
index XXXXXXX..XXXXXXX 100644
19
--- a/block/qed.h
25
--- a/include/qom/object_interfaces.h
20
+++ b/block/qed.h
26
+++ b/include/qom/object_interfaces.h
21
@@ -XXX,XX +XXX,XX @@ void qed_commit_l2_cache_entry(L2TableCache *l2_cache, CachedL2Table *l2_table);
27
@@ -XXX,XX +XXX,XX @@ Object *user_creatable_add_type(const char *type, const char *id,
22
/**
28
/**
23
* Table I/O functions
29
* user_creatable_add_dict:
30
* @qdict: the object definition
31
+ * @keyval: if true, use a keyval visitor for processing @qdict (i.e.
32
+ * assume that all @qdict values are strings); otherwise, use
33
+ * the normal QObject visitor (i.e. assume all @qdict values
34
+ * have the QType expected by the QOM object type)
35
* @errp: if an error occurs, a pointer to an area to store the error
36
*
37
* Create an instance of the user creatable object that is defined by
38
@@ -XXX,XX +XXX,XX @@ Object *user_creatable_add_type(const char *type, const char *id,
39
* ID from the key 'id'. The remaining entries in @qdict are used to
40
* initialize the object properties.
24
*/
41
*/
25
-int qed_read_l1_table_sync(BDRVQEDState *s);
42
-void user_creatable_add_dict(QDict *qdict, Error **errp);
26
-int qed_write_l1_table(BDRVQEDState *s, unsigned int index, unsigned int n);
43
+void user_creatable_add_dict(QDict *qdict, bool keyval, Error **errp);
27
-int qed_write_l1_table_sync(BDRVQEDState *s, unsigned int index,
28
- unsigned int n);
29
-int qed_read_l2_table_sync(BDRVQEDState *s, QEDRequest *request,
30
- uint64_t offset);
31
-int qed_read_l2_table(BDRVQEDState *s, QEDRequest *request, uint64_t offset);
32
-int qed_write_l2_table(BDRVQEDState *s, QEDRequest *request,
33
- unsigned int index, unsigned int n, bool flush);
34
-int qed_write_l2_table_sync(BDRVQEDState *s, QEDRequest *request,
35
- unsigned int index, unsigned int n, bool flush);
36
+int coroutine_fn qed_read_l1_table_sync(BDRVQEDState *s);
37
+int coroutine_fn qed_write_l1_table(BDRVQEDState *s, unsigned int index,
38
+ unsigned int n);
39
+int coroutine_fn qed_write_l1_table_sync(BDRVQEDState *s, unsigned int index,
40
+ unsigned int n);
41
+int coroutine_fn qed_read_l2_table_sync(BDRVQEDState *s, QEDRequest *request,
42
+ uint64_t offset);
43
+int coroutine_fn qed_read_l2_table(BDRVQEDState *s, QEDRequest *request,
44
+ uint64_t offset);
45
+int coroutine_fn qed_write_l2_table(BDRVQEDState *s, QEDRequest *request,
46
+ unsigned int index, unsigned int n,
47
+ bool flush);
48
+int coroutine_fn qed_write_l2_table_sync(BDRVQEDState *s, QEDRequest *request,
49
+ unsigned int index, unsigned int n,
50
+ bool flush);
51
44
52
/**
45
/**
53
* Cluster functions
46
* user_creatable_add_opts:
54
@@ -XXX,XX +XXX,XX @@ int coroutine_fn qed_find_cluster(BDRVQEDState *s, QEDRequest *request,
47
diff --git a/qemu-storage-daemon.c b/qemu-storage-daemon.c
55
/**
56
* Consistency check
57
*/
58
-int qed_check(BDRVQEDState *s, BdrvCheckResult *result, bool fix);
59
+int coroutine_fn qed_check(BDRVQEDState *s, BdrvCheckResult *result, bool fix);
60
61
QEDTable *qed_alloc_table(BDRVQEDState *s);
62
63
diff --git a/block/qed-check.c b/block/qed-check.c
64
index XXXXXXX..XXXXXXX 100644
48
index XXXXXXX..XXXXXXX 100644
65
--- a/block/qed-check.c
49
--- a/qemu-storage-daemon.c
66
+++ b/block/qed-check.c
50
+++ b/qemu-storage-daemon.c
67
@@ -XXX,XX +XXX,XX @@ static unsigned int qed_check_l2_table(QEDCheck *check, QEDTable *table)
51
@@ -XXX,XX +XXX,XX @@ static void process_options(int argc, char *argv[])
68
/**
52
QemuOpts *opts;
69
* Descend tables and check each cluster is referenced once only
53
const char *type;
70
*/
54
QDict *args;
71
-static int qed_check_l1_table(QEDCheck *check, QEDTable *table)
55
- QObject *ret_data = NULL;
72
+static int coroutine_fn qed_check_l1_table(QEDCheck *check, QEDTable *table)
56
57
/* FIXME The keyval parser rejects 'help' arguments, so we must
58
* unconditionall try QemuOpts first. */
59
@@ -XXX,XX +XXX,XX @@ static void process_options(int argc, char *argv[])
60
qemu_opts_del(opts);
61
62
args = keyval_parse(optarg, "qom-type", &error_fatal);
63
- qmp_object_add(args, &ret_data, &error_fatal);
64
+ user_creatable_add_dict(args, true, &error_fatal);
65
qobject_unref(args);
66
- qobject_unref(ret_data);
67
break;
68
}
69
default:
70
diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c
71
index XXXXXXX..XXXXXXX 100644
72
--- a/qom/object_interfaces.c
73
+++ b/qom/object_interfaces.c
74
@@ -XXX,XX +XXX,XX @@ out:
75
return obj;
76
}
77
78
-void user_creatable_add_dict(QDict *qdict, Error **errp)
79
+void user_creatable_add_dict(QDict *qdict, bool keyval, Error **errp)
73
{
80
{
74
BDRVQEDState *s = check->s;
81
Visitor *v;
75
unsigned int i, num_invalid_l1 = 0;
82
Object *obj;
76
@@ -XXX,XX +XXX,XX @@ static void qed_check_mark_clean(BDRVQEDState *s, BdrvCheckResult *result)
83
@@ -XXX,XX +XXX,XX @@ void user_creatable_add_dict(QDict *qdict, Error **errp)
84
}
85
qdict_del(qdict, "id");
86
87
- v = qobject_input_visitor_new(QOBJECT(qdict));
88
+ if (keyval) {
89
+ v = qobject_input_visitor_new_keyval(QOBJECT(qdict));
90
+ } else {
91
+ v = qobject_input_visitor_new(QOBJECT(qdict));
92
+ }
93
obj = user_creatable_add_type(type, id, qdict, v, errp);
94
visit_free(v);
95
object_unref(obj);
96
diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c
97
index XXXXXXX..XXXXXXX 100644
98
--- a/qom/qom-qmp-cmds.c
99
+++ b/qom/qom-qmp-cmds.c
100
@@ -XXX,XX +XXX,XX @@ void qmp_object_add(QDict *qdict, QObject **ret_data, Error **errp)
101
qobject_unref(pdict);
102
}
103
104
- user_creatable_add_dict(qdict, errp);
105
+ user_creatable_add_dict(qdict, false, errp);
77
}
106
}
78
107
79
/* Called with table_lock held. */
108
void qmp_object_del(const char *id, Error **errp)
80
-int qed_check(BDRVQEDState *s, BdrvCheckResult *result, bool fix)
81
+int coroutine_fn qed_check(BDRVQEDState *s, BdrvCheckResult *result, bool fix)
82
{
83
QEDCheck check = {
84
.s = s,
85
diff --git a/block/qed-table.c b/block/qed-table.c
86
index XXXXXXX..XXXXXXX 100644
87
--- a/block/qed-table.c
88
+++ b/block/qed-table.c
89
@@ -XXX,XX +XXX,XX @@
90
#include "qemu/bswap.h"
91
92
/* Called with table_lock held. */
93
-static int qed_read_table(BDRVQEDState *s, uint64_t offset, QEDTable *table)
94
+static int coroutine_fn qed_read_table(BDRVQEDState *s, uint64_t offset,
95
+ QEDTable *table)
96
{
97
unsigned int bytes = s->header.cluster_size * s->header.table_size;
98
99
@@ -XXX,XX +XXX,XX @@ out:
100
*
101
* Called with table_lock held.
102
*/
103
-static int qed_write_table(BDRVQEDState *s, uint64_t offset, QEDTable *table,
104
- unsigned int index, unsigned int n, bool flush)
105
+static int coroutine_fn qed_write_table(BDRVQEDState *s, uint64_t offset,
106
+ QEDTable *table, unsigned int index,
107
+ unsigned int n, bool flush)
108
{
109
unsigned int sector_mask = BDRV_SECTOR_SIZE / sizeof(uint64_t) - 1;
110
unsigned int start, end, i;
111
@@ -XXX,XX +XXX,XX @@ out:
112
return ret;
113
}
114
115
-int qed_read_l1_table_sync(BDRVQEDState *s)
116
+int coroutine_fn qed_read_l1_table_sync(BDRVQEDState *s)
117
{
118
return qed_read_table(s, s->header.l1_table_offset, s->l1_table);
119
}
120
121
/* Called with table_lock held. */
122
-int qed_write_l1_table(BDRVQEDState *s, unsigned int index, unsigned int n)
123
+int coroutine_fn qed_write_l1_table(BDRVQEDState *s, unsigned int index,
124
+ unsigned int n)
125
{
126
BLKDBG_EVENT(s->bs->file, BLKDBG_L1_UPDATE);
127
return qed_write_table(s, s->header.l1_table_offset,
128
s->l1_table, index, n, false);
129
}
130
131
-int qed_write_l1_table_sync(BDRVQEDState *s, unsigned int index,
132
- unsigned int n)
133
+int coroutine_fn qed_write_l1_table_sync(BDRVQEDState *s, unsigned int index,
134
+ unsigned int n)
135
{
136
return qed_write_l1_table(s, index, n);
137
}
138
139
/* Called with table_lock held. */
140
-int qed_read_l2_table(BDRVQEDState *s, QEDRequest *request, uint64_t offset)
141
+int coroutine_fn qed_read_l2_table(BDRVQEDState *s, QEDRequest *request,
142
+ uint64_t offset)
143
{
144
int ret;
145
146
@@ -XXX,XX +XXX,XX @@ int qed_read_l2_table(BDRVQEDState *s, QEDRequest *request, uint64_t offset)
147
return ret;
148
}
149
150
-int qed_read_l2_table_sync(BDRVQEDState *s, QEDRequest *request, uint64_t offset)
151
+int coroutine_fn qed_read_l2_table_sync(BDRVQEDState *s, QEDRequest *request,
152
+ uint64_t offset)
153
{
154
return qed_read_l2_table(s, request, offset);
155
}
156
157
/* Called with table_lock held. */
158
-int qed_write_l2_table(BDRVQEDState *s, QEDRequest *request,
159
- unsigned int index, unsigned int n, bool flush)
160
+int coroutine_fn qed_write_l2_table(BDRVQEDState *s, QEDRequest *request,
161
+ unsigned int index, unsigned int n,
162
+ bool flush)
163
{
164
BLKDBG_EVENT(s->bs->file, BLKDBG_L2_UPDATE);
165
return qed_write_table(s, request->l2_table->offset,
166
request->l2_table->table, index, n, flush);
167
}
168
169
-int qed_write_l2_table_sync(BDRVQEDState *s, QEDRequest *request,
170
- unsigned int index, unsigned int n, bool flush)
171
+int coroutine_fn qed_write_l2_table_sync(BDRVQEDState *s, QEDRequest *request,
172
+ unsigned int index, unsigned int n,
173
+ bool flush)
174
{
175
return qed_write_l2_table(s, request, index, n, flush);
176
}
177
diff --git a/block/qed.c b/block/qed.c
178
index XXXXXXX..XXXXXXX 100644
179
--- a/block/qed.c
180
+++ b/block/qed.c
181
@@ -XXX,XX +XXX,XX @@ static void coroutine_fn bdrv_qed_co_invalidate_cache(BlockDriverState *bs,
182
}
183
}
184
185
-static int bdrv_qed_co_check(BlockDriverState *bs, BdrvCheckResult *result,
186
- BdrvCheckMode fix)
187
+static int coroutine_fn bdrv_qed_co_check(BlockDriverState *bs,
188
+ BdrvCheckResult *result,
189
+ BdrvCheckMode fix)
190
{
191
BDRVQEDState *s = bs->opaque;
192
int ret;
193
--
109
--
194
2.20.1
110
2.25.3
195
111
196
112
diff view generated by jsdifflib