1 | The following changes since commit 23919ddfd56135cad3cb468a8f54d5a595f024f4: | 1 | The following changes since commit f17783e706ab9c7b3a2b69cf48e4f0ba40664f54: |
---|---|---|---|
2 | 2 | ||
3 | Merge remote-tracking branch 'remotes/aperard/tags/pull-xen-20190827' into staging (2019-08-27 15:52:36 +0100) | 3 | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20191220' into staging (2020-01-03 18:50:33 +0000) |
4 | 4 | ||
5 | are available in the Git repository at: | 5 | are available in the Git repository at: |
6 | 6 | ||
7 | https://github.com/XanClic/qemu.git tags/pull-block-2019-08-27 | 7 | https://github.com/XanClic/qemu.git tags/pull-block-2020-01-06 |
8 | 8 | ||
9 | for you to fetch changes up to bb043c056cffcc2f3ce88bfdaf2e76e455c09e2c: | 9 | for you to fetch changes up to 503ca1262bab2c11c533a4816d1ff4297d4f58a6: |
10 | 10 | ||
11 | iotests: Unify cache mode quoting (2019-08-27 19:48:44 +0200) | 11 | backup-top: Begin drain earlier (2020-01-06 14:26:23 +0100) |
12 | 12 | ||
13 | ---------------------------------------------------------------- | 13 | ---------------------------------------------------------------- |
14 | Block patches: | 14 | Block patches: |
15 | - qemu-io now accepts a file to read a write pattern from | 15 | - Minor fixes and tests from the freeze period (too minor to be included |
16 | - Ensure that raw files have their first block allocated so we can probe | 16 | in 4.2) |
17 | the O_DIRECT alignment if necessary | 17 | - Allow many bash iotests to test qcow2's external data file feature |
18 | - Various fixes | 18 | - Add compress filter driver |
19 | - Fix Python iotests after 6f6e1698a6 | ||
20 | - Fix for the backup job | ||
19 | 21 | ||
20 | ---------------------------------------------------------------- | 22 | ---------------------------------------------------------------- |
21 | Denis Plotnikov (1): | 23 | Andrey Shinkevich (3): |
22 | qemu-io: add pattern file for write command | 24 | block: introduce compress filter driver |
23 | 25 | qcow2: Allow writing compressed data of multiple clusters | |
24 | Max Reitz (7): | 26 | tests/qemu-iotests: add case to write compressed data of multiple |
25 | iotests: Fix _filter_img_create() | 27 | clusters |
26 | vmdk: Use bdrv_dirname() for relative extent paths | 28 | |
27 | iotests: Keep testing broken relative extent paths | 29 | Max Reitz (28): |
28 | vmdk: Reject invalid compressed writes | 30 | block: Add bdrv_qapi_perm_to_blk_perm() |
29 | iotests: Disable broken streamOptimized tests | 31 | block: Use bdrv_qapi_perm_to_blk_perm() |
30 | iotests: Disable 110 for vmdk.twoGbMaxExtentSparse | 32 | blkdebug: Allow taking/unsharing permissions |
31 | iotests: Disable 126 for flat vmdk subformats | 33 | iotests: Add @error to wait_until_completed |
32 | 34 | iotests: Add test for failing mirror complete | |
33 | Nir Soffer (3): | 35 | iotests: s/qocw2/qcow2/ |
34 | block: posix: Always allocate the first block | 36 | iotests/qcow2.py: Add dump-header-exts |
35 | iotests: Test allocate_first_block() with O_DIRECT | 37 | iotests/qcow2.py: Split feature fields into bits |
36 | iotests: Unify cache mode quoting | 38 | iotests: Add _filter_json_filename |
37 | 39 | iotests: Filter refcount_order in 036 | |
38 | Stefan Hajnoczi (1): | 40 | iotests: Replace IMGOPTS by _unsupported_imgopts |
39 | file-posix: fix request_alignment typo | 41 | iotests: Drop compat=1.1 in 050 |
40 | 42 | iotests: Let _make_test_img parse its parameters | |
41 | Thomas Huth (2): | 43 | iotests: Add -o and --no-opts to _make_test_img |
42 | iotests: Check for enabled drivers before testing them | 44 | iotests: Inject space into -ocompat=0.10 in 051 |
43 | tests/check-block: Skip iotests when sanitizers are enabled | 45 | iotests: Replace IMGOPTS= by -o |
46 | iotests: Replace IMGOPTS='' by --no-opts | ||
47 | iotests: Drop IMGOPTS use in 267 | ||
48 | iotests: Avoid qemu-img create | ||
49 | iotests: Use _rm_test_img for deleting test images | ||
50 | iotests: Avoid cp/mv of test images | ||
51 | iotests: Make 091 work with data_file | ||
52 | iotests: Make 110 work with data_file | ||
53 | iotests: Make 137 work with data_file | ||
54 | iotests: Make 198 work with data_file | ||
55 | iotests: Disable data_file where it cannot be used | ||
56 | iotests: Allow check -o data_file | ||
57 | backup-top: Begin drain earlier | ||
58 | |||
59 | PanNengyuan (1): | ||
60 | throttle-groups: fix memory leak in throttle_group_set_limit: | ||
61 | |||
62 | Philippe Mathieu-Daudé (1): | ||
63 | tests/qemu-iotests: Update tests to recent desugarized -accel option | ||
44 | 64 | ||
45 | Vladimir Sementsov-Ogievskiy (1): | 65 | Vladimir Sementsov-Ogievskiy (1): |
46 | block: fix permission update in bdrv_replace_node | 66 | qcow2-bitmaps: fix qcow2_can_store_new_dirty_bitmap |
47 | 67 | ||
48 | block.c | 5 +- | 68 | block.c | 47 +++++---- |
49 | block/file-posix.c | 53 +++++++++- | 69 | block/Makefile.objs | 1 + |
50 | block/vmdk.c | 64 ++++++++---- | 70 | block/backup-top.c | 4 +- |
51 | qemu-io-cmds.c | 99 +++++++++++++++++-- | 71 | block/blkdebug.c | 93 ++++++++++++++++- |
52 | tests/check-block.sh | 5 + | 72 | block/filter-compress.c | 168 +++++++++++++++++++++++++++++++ |
53 | tests/qemu-iotests/002 | 1 + | 73 | block/qcow2-bitmap.c | 41 ++++---- |
54 | tests/qemu-iotests/003 | 1 + | 74 | block/qcow2.c | 102 ++++++++++++++----- |
55 | tests/qemu-iotests/005 | 3 +- | 75 | block/throttle-groups.c | 4 +- |
56 | tests/qemu-iotests/009 | 1 + | 76 | include/block/block.h | 1 + |
57 | tests/qemu-iotests/010 | 1 + | 77 | qapi/block-core.json | 24 ++++- |
58 | tests/qemu-iotests/011 | 1 + | 78 | tests/qemu-iotests/007 | 5 +- |
59 | tests/qemu-iotests/017 | 3 +- | 79 | tests/qemu-iotests/014 | 2 + |
60 | tests/qemu-iotests/018 | 3 +- | 80 | tests/qemu-iotests/015 | 5 +- |
61 | tests/qemu-iotests/019 | 3 +- | 81 | tests/qemu-iotests/019 | 6 +- |
62 | tests/qemu-iotests/020 | 3 +- | 82 | tests/qemu-iotests/020 | 6 +- |
63 | tests/qemu-iotests/026 | 4 +- | 83 | tests/qemu-iotests/024 | 10 +- |
64 | tests/qemu-iotests/027 | 1 + | 84 | tests/qemu-iotests/026 | 5 +- |
65 | tests/qemu-iotests/032 | 1 + | 85 | tests/qemu-iotests/028 | 2 +- |
66 | tests/qemu-iotests/033 | 1 + | 86 | tests/qemu-iotests/029 | 7 +- |
67 | tests/qemu-iotests/034 | 3 +- | 87 | tests/qemu-iotests/031 | 9 +- |
68 | tests/qemu-iotests/037 | 3 +- | 88 | tests/qemu-iotests/031.out | 36 +++---- |
69 | tests/qemu-iotests/039 | 4 +- | 89 | tests/qemu-iotests/036 | 15 +-- |
70 | tests/qemu-iotests/052 | 2 +- | 90 | tests/qemu-iotests/036.out | 66 ++---------- |
71 | tests/qemu-iotests/059 | 34 ++++++- | 91 | tests/qemu-iotests/039 | 27 ++--- |
72 | tests/qemu-iotests/059.out | 26 +++-- | 92 | tests/qemu-iotests/039.out | 22 ++-- |
73 | tests/qemu-iotests/063 | 3 +- | 93 | tests/qemu-iotests/041 | 44 ++++++++ |
74 | tests/qemu-iotests/071 | 1 + | 94 | tests/qemu-iotests/041.out | 4 +- |
75 | tests/qemu-iotests/072 | 1 + | 95 | tests/qemu-iotests/043 | 4 +- |
76 | tests/qemu-iotests/081 | 4 +- | 96 | tests/qemu-iotests/046 | 2 + |
77 | tests/qemu-iotests/091 | 4 +- | 97 | tests/qemu-iotests/048 | 4 +- |
78 | tests/qemu-iotests/099 | 1 + | 98 | tests/qemu-iotests/050 | 8 +- |
79 | tests/qemu-iotests/105 | 3 +- | 99 | tests/qemu-iotests/051 | 7 +- |
80 | tests/qemu-iotests/110 | 3 +- | 100 | tests/qemu-iotests/053 | 4 +- |
81 | tests/qemu-iotests/120 | 1 + | 101 | tests/qemu-iotests/058 | 7 +- |
82 | tests/qemu-iotests/126 | 2 + | 102 | tests/qemu-iotests/059 | 20 ++-- |
83 | tests/qemu-iotests/{150.out => 150.out.qcow2} | 0 | 103 | tests/qemu-iotests/060 | 14 +-- |
84 | tests/qemu-iotests/150.out.raw | 12 +++ | 104 | tests/qemu-iotests/060.out | 20 ++-- |
85 | tests/qemu-iotests/162 | 4 +- | 105 | tests/qemu-iotests/061 | 63 ++++++------ |
86 | tests/qemu-iotests/175 | 47 +++++++-- | 106 | tests/qemu-iotests/061.out | 72 ++++++------- |
87 | tests/qemu-iotests/175.out | 16 ++- | 107 | tests/qemu-iotests/062 | 5 +- |
88 | tests/qemu-iotests/178.out.qcow2 | 4 +- | 108 | tests/qemu-iotests/063 | 18 ++-- |
89 | tests/qemu-iotests/184 | 1 + | 109 | tests/qemu-iotests/063.out | 3 +- |
90 | tests/qemu-iotests/186 | 1 + | 110 | tests/qemu-iotests/066 | 7 +- |
91 | tests/qemu-iotests/197 | 1 + | 111 | tests/qemu-iotests/067 | 6 +- |
92 | tests/qemu-iotests/215 | 1 + | 112 | tests/qemu-iotests/068 | 6 +- |
93 | tests/qemu-iotests/221.out | 12 ++- | 113 | tests/qemu-iotests/069 | 2 +- |
94 | tests/qemu-iotests/251 | 1 + | 114 | tests/qemu-iotests/071 | 7 +- |
95 | tests/qemu-iotests/253.out | 12 ++- | 115 | tests/qemu-iotests/073 | 4 + |
96 | tests/qemu-iotests/common.filter | 4 +- | 116 | tests/qemu-iotests/074 | 4 +- |
97 | tests/qemu-iotests/common.rc | 14 +++ | 117 | tests/qemu-iotests/079 | 3 +- |
98 | 50 files changed, 391 insertions(+), 87 deletions(-) | 118 | tests/qemu-iotests/080 | 7 +- |
99 | rename tests/qemu-iotests/{150.out => 150.out.qcow2} (100%) | 119 | tests/qemu-iotests/081 | 6 +- |
100 | create mode 100644 tests/qemu-iotests/150.out.raw | 120 | tests/qemu-iotests/085 | 18 ++-- |
121 | tests/qemu-iotests/085.out | 8 +- | ||
122 | tests/qemu-iotests/088 | 2 +- | ||
123 | tests/qemu-iotests/090 | 2 + | ||
124 | tests/qemu-iotests/091 | 2 +- | ||
125 | tests/qemu-iotests/091.out | 2 - | ||
126 | tests/qemu-iotests/092 | 2 +- | ||
127 | tests/qemu-iotests/094 | 4 +- | ||
128 | tests/qemu-iotests/095 | 5 +- | ||
129 | tests/qemu-iotests/098 | 6 +- | ||
130 | tests/qemu-iotests/099 | 10 +- | ||
131 | tests/qemu-iotests/103 | 5 +- | ||
132 | tests/qemu-iotests/106 | 2 +- | ||
133 | tests/qemu-iotests/108 | 10 +- | ||
134 | tests/qemu-iotests/109 | 4 +- | ||
135 | tests/qemu-iotests/110 | 11 +- | ||
136 | tests/qemu-iotests/110.out | 4 +- | ||
137 | tests/qemu-iotests/111 | 3 +- | ||
138 | tests/qemu-iotests/112 | 37 +++---- | ||
139 | tests/qemu-iotests/114 | 2 + | ||
140 | tests/qemu-iotests/115 | 3 +- | ||
141 | tests/qemu-iotests/121 | 9 +- | ||
142 | tests/qemu-iotests/122 | 6 +- | ||
143 | tests/qemu-iotests/123 | 4 +- | ||
144 | tests/qemu-iotests/125 | 2 +- | ||
145 | tests/qemu-iotests/137 | 17 +++- | ||
146 | tests/qemu-iotests/137.out | 6 +- | ||
147 | tests/qemu-iotests/138 | 8 +- | ||
148 | tests/qemu-iotests/141 | 4 +- | ||
149 | tests/qemu-iotests/142 | 2 +- | ||
150 | tests/qemu-iotests/144 | 4 +- | ||
151 | tests/qemu-iotests/153 | 12 +-- | ||
152 | tests/qemu-iotests/156 | 10 +- | ||
153 | tests/qemu-iotests/159 | 2 +- | ||
154 | tests/qemu-iotests/160 | 3 +- | ||
155 | tests/qemu-iotests/161 | 4 +- | ||
156 | tests/qemu-iotests/170 | 2 +- | ||
157 | tests/qemu-iotests/172 | 6 +- | ||
158 | tests/qemu-iotests/173 | 3 +- | ||
159 | tests/qemu-iotests/174 | 2 +- | ||
160 | tests/qemu-iotests/175 | 2 +- | ||
161 | tests/qemu-iotests/176 | 7 +- | ||
162 | tests/qemu-iotests/178 | 6 +- | ||
163 | tests/qemu-iotests/182 | 2 +- | ||
164 | tests/qemu-iotests/183 | 2 +- | ||
165 | tests/qemu-iotests/185 | 4 +- | ||
166 | tests/qemu-iotests/187 | 6 +- | ||
167 | tests/qemu-iotests/190 | 4 +- | ||
168 | tests/qemu-iotests/191 | 11 +- | ||
169 | tests/qemu-iotests/195 | 2 +- | ||
170 | tests/qemu-iotests/197 | 6 +- | ||
171 | tests/qemu-iotests/198 | 6 +- | ||
172 | tests/qemu-iotests/198.out | 4 +- | ||
173 | tests/qemu-iotests/200 | 7 +- | ||
174 | tests/qemu-iotests/201 | 6 +- | ||
175 | tests/qemu-iotests/214 | 46 ++++++++- | ||
176 | tests/qemu-iotests/214.out | 14 +++ | ||
177 | tests/qemu-iotests/215 | 6 +- | ||
178 | tests/qemu-iotests/217 | 3 +- | ||
179 | tests/qemu-iotests/220 | 5 +- | ||
180 | tests/qemu-iotests/225 | 2 +- | ||
181 | tests/qemu-iotests/229 | 3 +- | ||
182 | tests/qemu-iotests/232 | 4 +- | ||
183 | tests/qemu-iotests/235 | 2 +- | ||
184 | tests/qemu-iotests/243 | 10 +- | ||
185 | tests/qemu-iotests/244 | 15 +-- | ||
186 | tests/qemu-iotests/247 | 4 +- | ||
187 | tests/qemu-iotests/249 | 4 +- | ||
188 | tests/qemu-iotests/250 | 5 +- | ||
189 | tests/qemu-iotests/252 | 2 +- | ||
190 | tests/qemu-iotests/261 | 5 +- | ||
191 | tests/qemu-iotests/265 | 2 +- | ||
192 | tests/qemu-iotests/267 | 17 ++-- | ||
193 | tests/qemu-iotests/273 | 3 + | ||
194 | tests/qemu-iotests/check | 6 +- | ||
195 | tests/qemu-iotests/common.filter | 47 ++++++++- | ||
196 | tests/qemu-iotests/common.rc | 63 ++++++++++-- | ||
197 | tests/qemu-iotests/iotests.py | 18 ++-- | ||
198 | tests/qemu-iotests/qcow2.py | 23 ++++- | ||
199 | 131 files changed, 1139 insertions(+), 552 deletions(-) | ||
200 | create mode 100644 block/filter-compress.c | ||
101 | 201 | ||
102 | -- | 202 | -- |
103 | 2.21.0 | 203 | 2.24.1 |
104 | 204 | ||
105 | 205 | diff view generated by jsdifflib |
New patch | |||
---|---|---|---|
1 | We need some way to correlate QAPI BlockPermission values with | ||
2 | BLK_PERM_* flags. We could: | ||
1 | 3 | ||
4 | (1) have the same order in the QAPI definition as the the BLK_PERM_* | ||
5 | flags are in LSb-first order. However, then there is no guarantee | ||
6 | that they actually match (e.g. when someone modifies the QAPI schema | ||
7 | without thinking of the BLK_PERM_* definitions). | ||
8 | We could add static assertions, but these would break what’s good | ||
9 | about this solution, namely its simplicity. | ||
10 | |||
11 | (2) define the BLK_PERM_* flags based on the BlockPermission values. | ||
12 | But this way whenever someone were to modify the QAPI order | ||
13 | (perfectly sensible in theory), the BLK_PERM_* values would change. | ||
14 | Because these values are used for file locking, this might break | ||
15 | file locking between different qemu versions. | ||
16 | |||
17 | Therefore, go the slightly more cumbersome way: Add a function to | ||
18 | translate from the QAPI constants to the BLK_PERM_* flags. | ||
19 | |||
20 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
21 | Message-id: 20191108123455.39445-2-mreitz@redhat.com | ||
22 | Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> | ||
23 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
24 | --- | ||
25 | block.c | 18 ++++++++++++++++++ | ||
26 | include/block/block.h | 1 + | ||
27 | 2 files changed, 19 insertions(+) | ||
28 | |||
29 | diff --git a/block.c b/block.c | ||
30 | index XXXXXXX..XXXXXXX 100644 | ||
31 | --- a/block.c | ||
32 | +++ b/block.c | ||
33 | @@ -XXX,XX +XXX,XX @@ void bdrv_format_default_perms(BlockDriverState *bs, BdrvChild *c, | ||
34 | *nshared = shared; | ||
35 | } | ||
36 | |||
37 | +uint64_t bdrv_qapi_perm_to_blk_perm(BlockPermission qapi_perm) | ||
38 | +{ | ||
39 | + static const uint64_t permissions[] = { | ||
40 | + [BLOCK_PERMISSION_CONSISTENT_READ] = BLK_PERM_CONSISTENT_READ, | ||
41 | + [BLOCK_PERMISSION_WRITE] = BLK_PERM_WRITE, | ||
42 | + [BLOCK_PERMISSION_WRITE_UNCHANGED] = BLK_PERM_WRITE_UNCHANGED, | ||
43 | + [BLOCK_PERMISSION_RESIZE] = BLK_PERM_RESIZE, | ||
44 | + [BLOCK_PERMISSION_GRAPH_MOD] = BLK_PERM_GRAPH_MOD, | ||
45 | + }; | ||
46 | + | ||
47 | + QEMU_BUILD_BUG_ON(ARRAY_SIZE(permissions) != BLOCK_PERMISSION__MAX); | ||
48 | + QEMU_BUILD_BUG_ON(1UL << ARRAY_SIZE(permissions) != BLK_PERM_ALL + 1); | ||
49 | + | ||
50 | + assert(qapi_perm < BLOCK_PERMISSION__MAX); | ||
51 | + | ||
52 | + return permissions[qapi_perm]; | ||
53 | +} | ||
54 | + | ||
55 | static void bdrv_replace_child_noperm(BdrvChild *child, | ||
56 | BlockDriverState *new_bs) | ||
57 | { | ||
58 | diff --git a/include/block/block.h b/include/block/block.h | ||
59 | index XXXXXXX..XXXXXXX 100644 | ||
60 | --- a/include/block/block.h | ||
61 | +++ b/include/block/block.h | ||
62 | @@ -XXX,XX +XXX,XX @@ enum { | ||
63 | }; | ||
64 | |||
65 | char *bdrv_perm_names(uint64_t perm); | ||
66 | +uint64_t bdrv_qapi_perm_to_blk_perm(BlockPermission qapi_perm); | ||
67 | |||
68 | /* disk I/O throttling */ | ||
69 | void bdrv_init(void); | ||
70 | -- | ||
71 | 2.24.1 | ||
72 | |||
73 | diff view generated by jsdifflib |
1 | From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> | 1 | We can save some LoC in xdbg_graph_add_edge() by using |
---|---|---|---|
2 | bdrv_qapi_perm_to_blk_perm(). | ||
2 | 3 | ||
3 | It's wrong to OR shared permissions. It may lead to crash on further | 4 | Signed-off-by: Max Reitz <mreitz@redhat.com> |
4 | permission updates. | 5 | Message-id: 20191108123455.39445-3-mreitz@redhat.com |
5 | Also, no needs to consider previously calculated permissions, as at | 6 | Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> |
6 | this point we already bind all new parents and bdrv_get_cumulative_perm | ||
7 | result is enough. So fix the bug by just set permissions by | ||
8 | bdrv_get_cumulative_perm result. | ||
9 | |||
10 | Bug was introduced in long ago 234ac1a9025, in 2.9. | ||
11 | |||
12 | Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> | ||
13 | Message-id: 20190824100740.61635-1-vsementsov@virtuozzo.com | ||
14 | Signed-off-by: Max Reitz <mreitz@redhat.com> | 7 | Signed-off-by: Max Reitz <mreitz@redhat.com> |
15 | --- | 8 | --- |
16 | block.c | 5 ++--- | 9 | block.c | 29 ++++++++--------------------- |
17 | 1 file changed, 2 insertions(+), 3 deletions(-) | 10 | 1 file changed, 8 insertions(+), 21 deletions(-) |
18 | 11 | ||
19 | diff --git a/block.c b/block.c | 12 | diff --git a/block.c b/block.c |
20 | index XXXXXXX..XXXXXXX 100644 | 13 | index XXXXXXX..XXXXXXX 100644 |
21 | --- a/block.c | 14 | --- a/block.c |
22 | +++ b/block.c | 15 | +++ b/block.c |
23 | @@ -XXX,XX +XXX,XX @@ void bdrv_replace_node(BlockDriverState *from, BlockDriverState *to, | 16 | @@ -XXX,XX +XXX,XX @@ static void xdbg_graph_add_node(XDbgBlockGraphConstructor *gr, void *node, |
17 | static void xdbg_graph_add_edge(XDbgBlockGraphConstructor *gr, void *parent, | ||
18 | const BdrvChild *child) | ||
24 | { | 19 | { |
25 | BdrvChild *c, *next; | 20 | - typedef struct { |
26 | GSList *list = NULL, *p; | 21 | - unsigned int flag; |
27 | - uint64_t old_perm, old_shared; | 22 | - BlockPermission num; |
28 | uint64_t perm = 0, shared = BLK_PERM_ALL; | 23 | - } PermissionMap; |
29 | int ret; | 24 | - |
30 | 25 | - static const PermissionMap permissions[] = { | |
31 | @@ -XXX,XX +XXX,XX @@ void bdrv_replace_node(BlockDriverState *from, BlockDriverState *to, | 26 | - { BLK_PERM_CONSISTENT_READ, BLOCK_PERMISSION_CONSISTENT_READ }, |
32 | bdrv_unref(from); | 27 | - { BLK_PERM_WRITE, BLOCK_PERMISSION_WRITE }, |
28 | - { BLK_PERM_WRITE_UNCHANGED, BLOCK_PERMISSION_WRITE_UNCHANGED }, | ||
29 | - { BLK_PERM_RESIZE, BLOCK_PERMISSION_RESIZE }, | ||
30 | - { BLK_PERM_GRAPH_MOD, BLOCK_PERMISSION_GRAPH_MOD }, | ||
31 | - { 0, 0 } | ||
32 | - }; | ||
33 | - const PermissionMap *p; | ||
34 | + BlockPermission qapi_perm; | ||
35 | XDbgBlockGraphEdge *edge; | ||
36 | |||
37 | - QEMU_BUILD_BUG_ON(1UL << (ARRAY_SIZE(permissions) - 1) != BLK_PERM_ALL + 1); | ||
38 | - | ||
39 | edge = g_new0(XDbgBlockGraphEdge, 1); | ||
40 | |||
41 | edge->parent = xdbg_graph_node_num(gr, parent); | ||
42 | edge->child = xdbg_graph_node_num(gr, child->bs); | ||
43 | edge->name = g_strdup(child->name); | ||
44 | |||
45 | - for (p = permissions; p->flag; p++) { | ||
46 | - if (p->flag & child->perm) { | ||
47 | - QAPI_LIST_ADD(edge->perm, p->num); | ||
48 | + for (qapi_perm = 0; qapi_perm < BLOCK_PERMISSION__MAX; qapi_perm++) { | ||
49 | + uint64_t flag = bdrv_qapi_perm_to_blk_perm(qapi_perm); | ||
50 | + | ||
51 | + if (flag & child->perm) { | ||
52 | + QAPI_LIST_ADD(edge->perm, qapi_perm); | ||
53 | } | ||
54 | - if (p->flag & child->shared_perm) { | ||
55 | - QAPI_LIST_ADD(edge->shared_perm, p->num); | ||
56 | + if (flag & child->shared_perm) { | ||
57 | + QAPI_LIST_ADD(edge->shared_perm, qapi_perm); | ||
58 | } | ||
33 | } | 59 | } |
34 | 60 | ||
35 | - bdrv_get_cumulative_perm(to, &old_perm, &old_shared); | ||
36 | - bdrv_set_perm(to, old_perm | perm, old_shared | shared); | ||
37 | + bdrv_get_cumulative_perm(to, &perm, &shared); | ||
38 | + bdrv_set_perm(to, perm, shared); | ||
39 | |||
40 | out: | ||
41 | g_slist_free(list); | ||
42 | -- | 61 | -- |
43 | 2.21.0 | 62 | 2.24.1 |
44 | 63 | ||
45 | 64 | diff view generated by jsdifflib |
1 | From: Denis Plotnikov <dplotnikov@virtuozzo.com> | 1 | Sometimes it is useful to be able to add a node to the block graph that |
---|---|---|---|
2 | takes or unshare a certain set of permissions for debugging purposes. | ||
3 | This patch adds this capability to blkdebug. | ||
2 | 4 | ||
3 | The patch allows to provide a pattern file for write | 5 | (Note that you cannot make blkdebug release or share permissions that it |
4 | command. There was no similar ability before. | 6 | needs to take or cannot share, because this might result in assertion |
7 | failures in the block layer. But if the blkdebug node has no parents, | ||
8 | it will not take any permissions and share everything by default, so you | ||
9 | can then freely choose what permissions to take and share.) | ||
5 | 10 | ||
6 | Signed-off-by: Denis Plotnikov <dplotnikov@virtuozzo.com> | 11 | Signed-off-by: Max Reitz <mreitz@redhat.com> |
7 | Message-id: 20190820164616.4072-1-dplotnikov@virtuozzo.com | 12 | Message-id: 20191108123455.39445-4-mreitz@redhat.com |
8 | Reviewed-by: Eric Blake <eblake@redhat.com> | 13 | Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> |
9 | [mreitz: Keep optstring in alphabetical order] | ||
10 | Signed-off-by: Max Reitz <mreitz@redhat.com> | 14 | Signed-off-by: Max Reitz <mreitz@redhat.com> |
11 | --- | 15 | --- |
12 | qemu-io-cmds.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++--- | 16 | block/blkdebug.c | 93 +++++++++++++++++++++++++++++++++++++++++++- |
13 | 1 file changed, 93 insertions(+), 6 deletions(-) | 17 | qapi/block-core.json | 14 ++++++- |
18 | 2 files changed, 105 insertions(+), 2 deletions(-) | ||
14 | 19 | ||
15 | diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c | 20 | diff --git a/block/blkdebug.c b/block/blkdebug.c |
16 | index XXXXXXX..XXXXXXX 100644 | 21 | index XXXXXXX..XXXXXXX 100644 |
17 | --- a/qemu-io-cmds.c | 22 | --- a/block/blkdebug.c |
18 | +++ b/qemu-io-cmds.c | 23 | +++ b/block/blkdebug.c |
19 | @@ -XXX,XX +XXX,XX @@ static void qemu_io_free(void *p) | 24 | @@ -XXX,XX +XXX,XX @@ |
20 | qemu_vfree(p); | 25 | #include "qemu/cutils.h" |
26 | #include "qemu/config-file.h" | ||
27 | #include "block/block_int.h" | ||
28 | +#include "block/qdict.h" | ||
29 | #include "qemu/module.h" | ||
30 | #include "qemu/option.h" | ||
31 | +#include "qapi/qapi-visit-block-core.h" | ||
32 | #include "qapi/qmp/qdict.h" | ||
33 | +#include "qapi/qmp/qlist.h" | ||
34 | #include "qapi/qmp/qstring.h" | ||
35 | +#include "qapi/qobject-input-visitor.h" | ||
36 | #include "sysemu/qtest.h" | ||
37 | |||
38 | typedef struct BDRVBlkdebugState { | ||
39 | @@ -XXX,XX +XXX,XX @@ typedef struct BDRVBlkdebugState { | ||
40 | uint64_t opt_discard; | ||
41 | uint64_t max_discard; | ||
42 | |||
43 | + uint64_t take_child_perms; | ||
44 | + uint64_t unshare_child_perms; | ||
45 | + | ||
46 | /* For blkdebug_refresh_filename() */ | ||
47 | char *config_file; | ||
48 | |||
49 | @@ -XXX,XX +XXX,XX @@ static void blkdebug_parse_filename(const char *filename, QDict *options, | ||
50 | qdict_put_str(options, "x-image", filename); | ||
21 | } | 51 | } |
22 | 52 | ||
23 | +/* | 53 | +static int blkdebug_parse_perm_list(uint64_t *dest, QDict *options, |
24 | + * qemu_io_alloc_from_file() | 54 | + const char *prefix, Error **errp) |
25 | + * | ||
26 | + * Allocates the buffer and populates it with the content of the given file | ||
27 | + * up to @len bytes. If the file length is less than @len, then the buffer | ||
28 | + * is populated with the file content cyclically. | ||
29 | + * | ||
30 | + * @blk - the block backend where the buffer content is going to be written to | ||
31 | + * @len - the buffer length | ||
32 | + * @file_name - the file to read the content from | ||
33 | + * | ||
34 | + * Returns: the buffer pointer on success | ||
35 | + * NULL on error | ||
36 | + */ | ||
37 | +static void *qemu_io_alloc_from_file(BlockBackend *blk, size_t len, | ||
38 | + const char *file_name) | ||
39 | +{ | 55 | +{ |
40 | + char *buf, *buf_origin; | 56 | + int ret = 0; |
41 | + FILE *f = fopen(file_name, "r"); | 57 | + QDict *subqdict = NULL; |
42 | + int pattern_len; | 58 | + QObject *crumpled_subqdict = NULL; |
59 | + Visitor *v = NULL; | ||
60 | + BlockPermissionList *perm_list = NULL, *element; | ||
61 | + Error *local_err = NULL; | ||
43 | + | 62 | + |
44 | + if (!f) { | 63 | + *dest = 0; |
45 | + perror(file_name); | 64 | + |
46 | + return NULL; | 65 | + qdict_extract_subqdict(options, &subqdict, prefix); |
66 | + if (!qdict_size(subqdict)) { | ||
67 | + goto out; | ||
47 | + } | 68 | + } |
48 | + | 69 | + |
49 | + if (qemuio_misalign) { | 70 | + crumpled_subqdict = qdict_crumple(subqdict, errp); |
50 | + len += MISALIGN_OFFSET; | 71 | + if (!crumpled_subqdict) { |
72 | + ret = -EINVAL; | ||
73 | + goto out; | ||
51 | + } | 74 | + } |
52 | + | 75 | + |
53 | + buf_origin = buf = blk_blockalign(blk, len); | 76 | + v = qobject_input_visitor_new(crumpled_subqdict); |
54 | + | 77 | + visit_type_BlockPermissionList(v, NULL, &perm_list, &local_err); |
55 | + if (qemuio_misalign) { | 78 | + if (local_err) { |
56 | + buf_origin += MISALIGN_OFFSET; | 79 | + error_propagate(errp, local_err); |
57 | + buf += MISALIGN_OFFSET; | 80 | + ret = -EINVAL; |
58 | + len -= MISALIGN_OFFSET; | 81 | + goto out; |
59 | + } | 82 | + } |
60 | + | 83 | + |
61 | + pattern_len = fread(buf_origin, 1, len, f); | 84 | + for (element = perm_list; element; element = element->next) { |
62 | + | 85 | + *dest |= bdrv_qapi_perm_to_blk_perm(element->value); |
63 | + if (ferror(f)) { | ||
64 | + perror(file_name); | ||
65 | + goto error; | ||
66 | + } | 86 | + } |
67 | + | 87 | + |
68 | + if (pattern_len == 0) { | 88 | +out: |
69 | + fprintf(stderr, "%s: file is empty\n", file_name); | 89 | + qapi_free_BlockPermissionList(perm_list); |
70 | + goto error; | 90 | + visit_free(v); |
91 | + qobject_unref(subqdict); | ||
92 | + qobject_unref(crumpled_subqdict); | ||
93 | + return ret; | ||
94 | +} | ||
95 | + | ||
96 | +static int blkdebug_parse_perms(BDRVBlkdebugState *s, QDict *options, | ||
97 | + Error **errp) | ||
98 | +{ | ||
99 | + int ret; | ||
100 | + | ||
101 | + ret = blkdebug_parse_perm_list(&s->take_child_perms, options, | ||
102 | + "take-child-perms.", errp); | ||
103 | + if (ret < 0) { | ||
104 | + return ret; | ||
71 | + } | 105 | + } |
72 | + | 106 | + |
73 | + fclose(f); | 107 | + ret = blkdebug_parse_perm_list(&s->unshare_child_perms, options, |
74 | + | 108 | + "unshare-child-perms.", errp); |
75 | + if (len > pattern_len) { | 109 | + if (ret < 0) { |
76 | + len -= pattern_len; | 110 | + return ret; |
77 | + buf += pattern_len; | ||
78 | + | ||
79 | + while (len > 0) { | ||
80 | + size_t len_to_copy = MIN(pattern_len, len); | ||
81 | + | ||
82 | + memcpy(buf, buf_origin, len_to_copy); | ||
83 | + | ||
84 | + len -= len_to_copy; | ||
85 | + buf += len_to_copy; | ||
86 | + } | ||
87 | + } | 111 | + } |
88 | + | 112 | + |
89 | + return buf_origin; | 113 | + return 0; |
90 | + | ||
91 | +error: | ||
92 | + qemu_io_free(buf_origin); | ||
93 | + return NULL; | ||
94 | +} | 114 | +} |
95 | + | 115 | + |
96 | static void dump_buffer(const void *buffer, int64_t offset, int64_t len) | 116 | static QemuOptsList runtime_opts = { |
97 | { | 117 | .name = "blkdebug", |
98 | uint64_t i; | 118 | .head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head), |
99 | @@ -XXX,XX +XXX,XX @@ static void write_help(void) | 119 | @@ -XXX,XX +XXX,XX @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags, |
100 | " -n, -- with -z, don't allow slow fallback\n" | 120 | /* Set initial state */ |
101 | " -p, -- ignored for backwards compatibility\n" | 121 | s->state = 1; |
102 | " -P, -- use different pattern to fill file\n" | 122 | |
103 | +" -s, -- use a pattern file to fill the write buffer\n" | 123 | + /* Parse permissions modifiers before opening the image file */ |
104 | " -C, -- report statistics in a machine parsable format\n" | 124 | + ret = blkdebug_parse_perms(s, options, errp); |
105 | " -q, -- quiet mode, do not show I/O statistics\n" | 125 | + if (ret < 0) { |
106 | " -u, -- with -z, allow unmapping\n" | 126 | + goto out; |
107 | @@ -XXX,XX +XXX,XX @@ static const cmdinfo_t write_cmd = { | 127 | + } |
108 | .perm = BLK_PERM_WRITE, | 128 | + |
109 | .argmin = 2, | 129 | /* Open the image file */ |
110 | .argmax = -1, | 130 | bs->file = bdrv_open_child(qemu_opt_get(opts, "x-image"), options, "image", |
111 | - .args = "[-bcCfnquz] [-P pattern] off len", | 131 | bs, &child_file, false, &local_err); |
112 | + .args = "[-bcCfnquz] [-P pattern | -s source_file] off len", | 132 | @@ -XXX,XX +XXX,XX @@ static int blkdebug_reopen_prepare(BDRVReopenState *reopen_state, |
113 | .oneline = "writes a number of bytes at a specified offset", | 133 | return 0; |
114 | .help = write_help, | 134 | } |
115 | }; | 135 | |
116 | @@ -XXX,XX +XXX,XX @@ static int write_f(BlockBackend *blk, int argc, char **argv) | 136 | +static void blkdebug_child_perm(BlockDriverState *bs, BdrvChild *c, |
117 | { | 137 | + const BdrvChildRole *role, |
118 | struct timespec t1, t2; | 138 | + BlockReopenQueue *reopen_queue, |
119 | bool Cflag = false, qflag = false, bflag = false; | 139 | + uint64_t perm, uint64_t shared, |
120 | - bool Pflag = false, zflag = false, cflag = false; | 140 | + uint64_t *nperm, uint64_t *nshared) |
121 | + bool Pflag = false, zflag = false, cflag = false, sflag = false; | 141 | +{ |
122 | int flags = 0; | 142 | + BDRVBlkdebugState *s = bs->opaque; |
123 | int c, cnt, ret; | 143 | + |
124 | char *buf = NULL; | 144 | + bdrv_filter_default_perms(bs, c, role, reopen_queue, perm, shared, |
125 | @@ -XXX,XX +XXX,XX @@ static int write_f(BlockBackend *blk, int argc, char **argv) | 145 | + nperm, nshared); |
126 | /* Some compilers get confused and warn if this is not initialized. */ | 146 | + |
127 | int64_t total = 0; | 147 | + *nperm |= s->take_child_perms; |
128 | int pattern = 0xcd; | 148 | + *nshared &= ~s->unshare_child_perms; |
129 | + const char *file_name = NULL; | 149 | +} |
130 | 150 | + | |
131 | - while ((c = getopt(argc, argv, "bcCfnpP:quz")) != -1) { | 151 | static const char *const blkdebug_strong_runtime_opts[] = { |
132 | + while ((c = getopt(argc, argv, "bcCfnpP:qs:uz")) != -1) { | 152 | "config", |
133 | switch (c) { | 153 | "inject-error.", |
134 | case 'b': | 154 | @@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_blkdebug = { |
135 | bflag = true; | 155 | .bdrv_file_open = blkdebug_open, |
136 | @@ -XXX,XX +XXX,XX @@ static int write_f(BlockBackend *blk, int argc, char **argv) | 156 | .bdrv_close = blkdebug_close, |
137 | case 'q': | 157 | .bdrv_reopen_prepare = blkdebug_reopen_prepare, |
138 | qflag = true; | 158 | - .bdrv_child_perm = bdrv_filter_default_perms, |
139 | break; | 159 | + .bdrv_child_perm = blkdebug_child_perm, |
140 | + case 's': | 160 | |
141 | + sflag = true; | 161 | .bdrv_getlength = blkdebug_getlength, |
142 | + file_name = optarg; | 162 | .bdrv_refresh_filename = blkdebug_refresh_filename, |
143 | + break; | 163 | diff --git a/qapi/block-core.json b/qapi/block-core.json |
144 | case 'u': | 164 | index XXXXXXX..XXXXXXX 100644 |
145 | flags |= BDRV_REQ_MAY_UNMAP; | 165 | --- a/qapi/block-core.json |
146 | break; | 166 | +++ b/qapi/block-core.json |
147 | @@ -XXX,XX +XXX,XX @@ static int write_f(BlockBackend *blk, int argc, char **argv) | 167 | @@ -XXX,XX +XXX,XX @@ |
148 | return -EINVAL; | 168 | # |
149 | } | 169 | # @set-state: array of state-change descriptions |
150 | 170 | # | |
151 | - if (zflag && Pflag) { | 171 | +# @take-child-perms: Permissions to take on @image in addition to what |
152 | - printf("-z and -P cannot be specified at the same time\n"); | 172 | +# is necessary anyway (which depends on how the |
153 | + if (zflag + Pflag + sflag > 1) { | 173 | +# blkdebug node is used). Defaults to none. |
154 | + printf("Only one of -z, -P, and -s " | 174 | +# (since 5.0) |
155 | + "can be specified at the same time\n"); | 175 | +# |
156 | return -EINVAL; | 176 | +# @unshare-child-perms: Permissions not to share on @image in addition |
157 | } | 177 | +# to what cannot be shared anyway (which depends |
158 | 178 | +# on how the blkdebug node is used). Defaults | |
159 | @@ -XXX,XX +XXX,XX @@ static int write_f(BlockBackend *blk, int argc, char **argv) | 179 | +# to none. (since 5.0) |
160 | } | 180 | +# |
161 | 181 | # Since: 2.9 | |
162 | if (!zflag) { | 182 | ## |
163 | - buf = qemu_io_alloc(blk, count, pattern); | 183 | { 'struct': 'BlockdevOptionsBlkdebug', |
164 | + if (sflag) { | 184 | @@ -XXX,XX +XXX,XX @@ |
165 | + buf = qemu_io_alloc_from_file(blk, count, file_name); | 185 | '*opt-write-zero': 'int32', '*max-write-zero': 'int32', |
166 | + if (!buf) { | 186 | '*opt-discard': 'int32', '*max-discard': 'int32', |
167 | + return -EINVAL; | 187 | '*inject-error': ['BlkdebugInjectErrorOptions'], |
168 | + } | 188 | - '*set-state': ['BlkdebugSetStateOptions'] } } |
169 | + } else { | 189 | + '*set-state': ['BlkdebugSetStateOptions'], |
170 | + buf = qemu_io_alloc(blk, count, pattern); | 190 | + '*take-child-perms': ['BlockPermission'], |
171 | + } | 191 | + '*unshare-child-perms': ['BlockPermission'] } } |
172 | } | 192 | |
173 | 193 | ## | |
174 | clock_gettime(CLOCK_MONOTONIC, &t1); | 194 | # @BlockdevOptionsBlklogwrites: |
175 | -- | 195 | -- |
176 | 2.21.0 | 196 | 2.24.1 |
177 | 197 | ||
178 | 198 | diff view generated by jsdifflib |
1 | Compressed writes generally have to write full clusters, not just in | 1 | Callers can use this new parameter to expect failure during the |
---|---|---|---|
2 | theory but also in practice when it comes to vmdk's streamOptimized | 2 | completion process. |
3 | subformat. It currently is just silently broken for writes with | ||
4 | non-zero in-cluster offsets: | ||
5 | |||
6 | $ qemu-img create -f vmdk -o subformat=streamOptimized foo.vmdk 1M | ||
7 | $ qemu-io -c 'write 4k 4k' -c 'read 4k 4k' foo.vmdk | ||
8 | wrote 4096/4096 bytes at offset 4096 | ||
9 | 4 KiB, 1 ops; 00.01 sec (443.724 KiB/sec and 110.9309 ops/sec) | ||
10 | read failed: Invalid argument | ||
11 | |||
12 | (The technical reason is that vmdk_write_extent() just writes the | ||
13 | incomplete compressed data actually to offset 4k. When reading the | ||
14 | data, vmdk_read_extent() looks at offset 0 and finds the compressed data | ||
15 | size to be 0, because that is what it reads from there. This yields an | ||
16 | error.) | ||
17 | |||
18 | For incomplete writes with zero in-cluster offsets, the error path when | ||
19 | reading the rest of the cluster is a bit different, but the result is | ||
20 | the same: | ||
21 | |||
22 | $ qemu-img create -f vmdk -o subformat=streamOptimized foo.vmdk 1M | ||
23 | $ qemu-io -c 'write 0k 4k' -c 'read 4k 4k' foo.vmdk | ||
24 | wrote 4096/4096 bytes at offset 0 | ||
25 | 4 KiB, 1 ops; 00.01 sec (362.641 KiB/sec and 90.6603 ops/sec) | ||
26 | read failed: Invalid argument | ||
27 | |||
28 | (Here, vmdk_read_extent() finds the data and then sees that the | ||
29 | uncompressed data is short.) | ||
30 | |||
31 | It is better to reject invalid writes than to make the user believe they | ||
32 | might have succeeded and then fail when trying to read it back. | ||
33 | 3 | ||
34 | Signed-off-by: Max Reitz <mreitz@redhat.com> | 4 | Signed-off-by: Max Reitz <mreitz@redhat.com> |
35 | Reviewed-by: John Snow <jsnow@redhat.com> | 5 | Reviewed-by: John Snow <jsnow@redhat.com> |
36 | Message-id: 20190815153638.4600-5-mreitz@redhat.com | 6 | Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> |
37 | Reviewed-by: John Snow <jsnow@redhat.com> | 7 | Message-id: 20191108123455.39445-5-mreitz@redhat.com |
38 | Signed-off-by: Max Reitz <mreitz@redhat.com> | 8 | Signed-off-by: Max Reitz <mreitz@redhat.com> |
39 | --- | 9 | --- |
40 | block/vmdk.c | 10 ++++++++++ | 10 | tests/qemu-iotests/iotests.py | 18 ++++++++++++------ |
41 | 1 file changed, 10 insertions(+) | 11 | 1 file changed, 12 insertions(+), 6 deletions(-) |
42 | 12 | ||
43 | diff --git a/block/vmdk.c b/block/vmdk.c | 13 | diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py |
44 | index XXXXXXX..XXXXXXX 100644 | 14 | index XXXXXXX..XXXXXXX 100644 |
45 | --- a/block/vmdk.c | 15 | --- a/tests/qemu-iotests/iotests.py |
46 | +++ b/block/vmdk.c | 16 | +++ b/tests/qemu-iotests/iotests.py |
47 | @@ -XXX,XX +XXX,XX @@ static int vmdk_write_extent(VmdkExtent *extent, int64_t cluster_offset, | 17 | @@ -XXX,XX +XXX,XX @@ class QMPTestCase(unittest.TestCase): |
48 | if (extent->compressed) { | 18 | self.assert_no_active_block_jobs() |
49 | void *compressed_data; | 19 | return result |
50 | 20 | ||
51 | + /* Only whole clusters */ | 21 | - def wait_until_completed(self, drive='drive0', check_offset=True, wait=60.0): |
52 | + if (offset_in_cluster || | 22 | + def wait_until_completed(self, drive='drive0', check_offset=True, wait=60.0, |
53 | + n_bytes > (extent->cluster_sectors * SECTOR_SIZE) || | 23 | + error=None): |
54 | + (n_bytes < (extent->cluster_sectors * SECTOR_SIZE) && | 24 | '''Wait for a block job to finish, returning the event''' |
55 | + offset + n_bytes != extent->end_sector * SECTOR_SIZE)) | 25 | while True: |
56 | + { | 26 | for event in self.vm.get_qmp_events(wait=wait): |
57 | + ret = -EINVAL; | 27 | if event['event'] == 'BLOCK_JOB_COMPLETED': |
58 | + goto out; | 28 | self.assert_qmp(event, 'data/device', drive) |
59 | + } | 29 | - self.assert_qmp_absent(event, 'data/error') |
60 | + | 30 | - if check_offset: |
61 | if (!extent->has_marker) { | 31 | - self.assert_qmp(event, 'data/offset', event['data']['len']) |
62 | ret = -EINVAL; | 32 | + if error is None: |
63 | goto out; | 33 | + self.assert_qmp_absent(event, 'data/error') |
34 | + if check_offset: | ||
35 | + self.assert_qmp(event, 'data/offset', | ||
36 | + event['data']['len']) | ||
37 | + else: | ||
38 | + self.assert_qmp(event, 'data/error', error) | ||
39 | self.assert_no_active_block_jobs() | ||
40 | return event | ||
41 | elif event['event'] == 'JOB_STATUS_CHANGE': | ||
42 | @@ -XXX,XX +XXX,XX @@ class QMPTestCase(unittest.TestCase): | ||
43 | self.assert_qmp(event, 'data/type', 'mirror') | ||
44 | self.assert_qmp(event, 'data/offset', event['data']['len']) | ||
45 | |||
46 | - def complete_and_wait(self, drive='drive0', wait_ready=True): | ||
47 | + def complete_and_wait(self, drive='drive0', wait_ready=True, | ||
48 | + completion_error=None): | ||
49 | '''Complete a block job and wait for it to finish''' | ||
50 | if wait_ready: | ||
51 | self.wait_ready(drive=drive) | ||
52 | @@ -XXX,XX +XXX,XX @@ class QMPTestCase(unittest.TestCase): | ||
53 | result = self.vm.qmp('block-job-complete', device=drive) | ||
54 | self.assert_qmp(result, 'return', {}) | ||
55 | |||
56 | - event = self.wait_until_completed(drive=drive) | ||
57 | + event = self.wait_until_completed(drive=drive, error=completion_error) | ||
58 | self.assert_qmp(event, 'data/type', 'mirror') | ||
59 | |||
60 | def pause_wait(self, job_id='job0'): | ||
64 | -- | 61 | -- |
65 | 2.21.0 | 62 | 2.24.1 |
66 | 63 | ||
67 | 64 | diff view generated by jsdifflib |
New patch | |||
---|---|---|---|
1 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
2 | Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> | ||
3 | Tested-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> | ||
4 | Reviewed-by: John Snow <jsnow@redhat.com> | ||
5 | Message-id: 20191108123455.39445-6-mreitz@redhat.com | ||
6 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
7 | --- | ||
8 | tests/qemu-iotests/041 | 44 ++++++++++++++++++++++++++++++++++++++ | ||
9 | tests/qemu-iotests/041.out | 4 ++-- | ||
10 | 2 files changed, 46 insertions(+), 2 deletions(-) | ||
1 | 11 | ||
12 | diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041 | ||
13 | index XXXXXXX..XXXXXXX 100755 | ||
14 | --- a/tests/qemu-iotests/041 | ||
15 | +++ b/tests/qemu-iotests/041 | ||
16 | @@ -XXX,XX +XXX,XX @@ class TestOrphanedSource(iotests.QMPTestCase): | ||
17 | target='dest-ro') | ||
18 | self.assert_qmp(result, 'error/class', 'GenericError') | ||
19 | |||
20 | + def test_failing_permission_in_complete(self): | ||
21 | + self.assert_no_active_block_jobs() | ||
22 | + | ||
23 | + # Unshare consistent-read on the target | ||
24 | + # (The mirror job does not care) | ||
25 | + result = self.vm.qmp('blockdev-add', | ||
26 | + driver='blkdebug', | ||
27 | + node_name='dest-perm', | ||
28 | + image='dest', | ||
29 | + unshare_child_perms=['consistent-read']) | ||
30 | + self.assert_qmp(result, 'return', {}) | ||
31 | + | ||
32 | + result = self.vm.qmp('blockdev-mirror', job_id='job', device='src', | ||
33 | + sync='full', target='dest', | ||
34 | + filter_node_name='mirror-filter') | ||
35 | + self.assert_qmp(result, 'return', {}) | ||
36 | + | ||
37 | + # Require consistent-read on the source | ||
38 | + # (We can only add this node once the job has started, or it | ||
39 | + # will complain that it does not want to run on non-root nodes) | ||
40 | + result = self.vm.qmp('blockdev-add', | ||
41 | + driver='blkdebug', | ||
42 | + node_name='src-perm', | ||
43 | + image='src', | ||
44 | + take_child_perms=['consistent-read']) | ||
45 | + self.assert_qmp(result, 'return', {}) | ||
46 | + | ||
47 | + # While completing, mirror will attempt to replace src by | ||
48 | + # dest, which must fail because src-perm requires | ||
49 | + # consistent-read but dest-perm does not share it; thus | ||
50 | + # aborting the job when it is supposed to complete | ||
51 | + self.complete_and_wait('job', | ||
52 | + completion_error='Operation not permitted') | ||
53 | + | ||
54 | + # Assert that all of our nodes are still there (except for the | ||
55 | + # mirror filter, which should be gone despite the failure) | ||
56 | + nodes = self.vm.qmp('query-named-block-nodes')['return'] | ||
57 | + nodes = [node['node-name'] for node in nodes] | ||
58 | + | ||
59 | + for expect in ('src', 'src-perm', 'dest', 'dest-perm'): | ||
60 | + self.assertTrue(expect in nodes, '%s disappeared' % expect) | ||
61 | + self.assertFalse('mirror-filter' in nodes, | ||
62 | + 'Mirror filter node did not disappear') | ||
63 | + | ||
64 | if __name__ == '__main__': | ||
65 | iotests.main(supported_fmts=['qcow2', 'qed'], | ||
66 | supported_protocols=['file']) | ||
67 | diff --git a/tests/qemu-iotests/041.out b/tests/qemu-iotests/041.out | ||
68 | index XXXXXXX..XXXXXXX 100644 | ||
69 | --- a/tests/qemu-iotests/041.out | ||
70 | +++ b/tests/qemu-iotests/041.out | ||
71 | @@ -XXX,XX +XXX,XX @@ | ||
72 | -.......................................................................................... | ||
73 | +........................................................................................... | ||
74 | ---------------------------------------------------------------------- | ||
75 | -Ran 90 tests | ||
76 | +Ran 91 tests | ||
77 | |||
78 | OK | ||
79 | -- | ||
80 | 2.24.1 | ||
81 | |||
82 | diff view generated by jsdifflib |
New patch | |||
---|---|---|---|
1 | From: PanNengyuan <pannengyuan@huawei.com> | ||
1 | 2 | ||
3 | This avoid a memory leak when qom-set is called to set throttle_group | ||
4 | limits, here is an easy way to reproduce: | ||
5 | |||
6 | 1. run qemu-iotests as follow and check the result with asan: | ||
7 | ./check -qcow2 184 | ||
8 | |||
9 | Following is the asan output backtrack: | ||
10 | Direct leak of 912 byte(s) in 3 object(s) allocated from: | ||
11 | #0 0xffff8d7ab3c3 in __interceptor_calloc (/lib64/libasan.so.4+0xd33c3) | ||
12 | #1 0xffff8d4c31cb in g_malloc0 (/lib64/libglib-2.0.so.0+0x571cb) | ||
13 | #2 0x190c857 in qobject_input_start_struct /mnt/sdc/qemu-master/qemu-4.2.0-rc0/qapi/qobject-input-visitor.c:295 | ||
14 | #3 0x19070df in visit_start_struct /mnt/sdc/qemu-master/qemu-4.2.0-rc0/qapi/qapi-visit-core.c:49 | ||
15 | #4 0x1948b87 in visit_type_ThrottleLimits qapi/qapi-visit-block-core.c:3759 | ||
16 | #5 0x17e4aa3 in throttle_group_set_limits /mnt/sdc/qemu-master/qemu-4.2.0-rc0/block/throttle-groups.c:900 | ||
17 | #6 0x1650eff in object_property_set /mnt/sdc/qemu-master/qemu-4.2.0-rc0/qom/object.c:1272 | ||
18 | #7 0x1658517 in object_property_set_qobject /mnt/sdc/qemu-master/qemu-4.2.0-rc0/qom/qom-qobject.c:26 | ||
19 | #8 0x15880bb in qmp_qom_set /mnt/sdc/qemu-master/qemu-4.2.0-rc0/qom/qom-qmp-cmds.c:74 | ||
20 | #9 0x157e3e3 in qmp_marshal_qom_set qapi/qapi-commands-qom.c:154 | ||
21 | |||
22 | Reported-by: Euler Robot <euler.robot@huawei.com> | ||
23 | Signed-off-by: PanNengyuan <pannengyuan@huawei.com> | ||
24 | Message-id: 1574835614-42028-1-git-send-email-pannengyuan@huawei.com | ||
25 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
26 | --- | ||
27 | block/throttle-groups.c | 4 ++-- | ||
28 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
29 | |||
30 | diff --git a/block/throttle-groups.c b/block/throttle-groups.c | ||
31 | index XXXXXXX..XXXXXXX 100644 | ||
32 | --- a/block/throttle-groups.c | ||
33 | +++ b/block/throttle-groups.c | ||
34 | @@ -XXX,XX +XXX,XX @@ static void throttle_group_set_limits(Object *obj, Visitor *v, | ||
35 | { | ||
36 | ThrottleGroup *tg = THROTTLE_GROUP(obj); | ||
37 | ThrottleConfig cfg; | ||
38 | - ThrottleLimits arg = { 0 }; | ||
39 | - ThrottleLimits *argp = &arg; | ||
40 | + ThrottleLimits *argp; | ||
41 | Error *local_err = NULL; | ||
42 | |||
43 | visit_type_ThrottleLimits(v, name, &argp, &local_err); | ||
44 | @@ -XXX,XX +XXX,XX @@ static void throttle_group_set_limits(Object *obj, Visitor *v, | ||
45 | unlock: | ||
46 | qemu_mutex_unlock(&tg->lock); | ||
47 | ret: | ||
48 | + qapi_free_ThrottleLimits(argp); | ||
49 | error_propagate(errp, local_err); | ||
50 | return; | ||
51 | } | ||
52 | -- | ||
53 | 2.24.1 | ||
54 | |||
55 | diff view generated by jsdifflib |
New patch | |||
---|---|---|---|
1 | From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> | ||
1 | 2 | ||
3 | qcow2_can_store_new_dirty_bitmap works wrong, as it considers only | ||
4 | bitmaps already stored in the qcow2 image and ignores persistent | ||
5 | BdrvDirtyBitmap objects. | ||
6 | |||
7 | So, let's instead count persistent BdrvDirtyBitmaps. We load all qcow2 | ||
8 | bitmaps on open, so there should not be any bitmap in the image for | ||
9 | which we don't have BdrvDirtyBitmaps version. If it is - it's a kind of | ||
10 | corruption, and no reason to check for corruptions here (open() and | ||
11 | close() are better places for it). | ||
12 | |||
13 | Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> | ||
14 | Message-id: 20191014115126.15360-2-vsementsov@virtuozzo.com | ||
15 | Reviewed-by: Max Reitz <mreitz@redhat.com> | ||
16 | Cc: qemu-stable@nongnu.org | ||
17 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
18 | --- | ||
19 | block/qcow2-bitmap.c | 41 ++++++++++++++++++----------------------- | ||
20 | 1 file changed, 18 insertions(+), 23 deletions(-) | ||
21 | |||
22 | diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c | ||
23 | index XXXXXXX..XXXXXXX 100644 | ||
24 | --- a/block/qcow2-bitmap.c | ||
25 | +++ b/block/qcow2-bitmap.c | ||
26 | @@ -XXX,XX +XXX,XX @@ bool coroutine_fn qcow2_co_can_store_new_dirty_bitmap(BlockDriverState *bs, | ||
27 | Error **errp) | ||
28 | { | ||
29 | BDRVQcow2State *s = bs->opaque; | ||
30 | - bool found; | ||
31 | - Qcow2BitmapList *bm_list; | ||
32 | + BdrvDirtyBitmap *bitmap; | ||
33 | + uint64_t bitmap_directory_size = 0; | ||
34 | + uint32_t nb_bitmaps = 0; | ||
35 | + | ||
36 | + if (bdrv_find_dirty_bitmap(bs, name)) { | ||
37 | + error_setg(errp, "Bitmap already exists: %s", name); | ||
38 | + return false; | ||
39 | + } | ||
40 | |||
41 | if (s->qcow_version < 3) { | ||
42 | /* Without autoclear_features, we would always have to assume | ||
43 | @@ -XXX,XX +XXX,XX @@ bool coroutine_fn qcow2_co_can_store_new_dirty_bitmap(BlockDriverState *bs, | ||
44 | goto fail; | ||
45 | } | ||
46 | |||
47 | - if (s->nb_bitmaps == 0) { | ||
48 | - return true; | ||
49 | + FOR_EACH_DIRTY_BITMAP(bs, bitmap) { | ||
50 | + if (bdrv_dirty_bitmap_get_persistence(bitmap)) { | ||
51 | + nb_bitmaps++; | ||
52 | + bitmap_directory_size += | ||
53 | + calc_dir_entry_size(strlen(bdrv_dirty_bitmap_name(bitmap)), 0); | ||
54 | + } | ||
55 | } | ||
56 | + nb_bitmaps++; | ||
57 | + bitmap_directory_size += calc_dir_entry_size(strlen(name), 0); | ||
58 | |||
59 | - if (s->nb_bitmaps >= QCOW2_MAX_BITMAPS) { | ||
60 | + if (nb_bitmaps > QCOW2_MAX_BITMAPS) { | ||
61 | error_setg(errp, | ||
62 | "Maximum number of persistent bitmaps is already reached"); | ||
63 | goto fail; | ||
64 | } | ||
65 | |||
66 | - if (s->bitmap_directory_size + calc_dir_entry_size(strlen(name), 0) > | ||
67 | - QCOW2_MAX_BITMAP_DIRECTORY_SIZE) | ||
68 | - { | ||
69 | + if (bitmap_directory_size > QCOW2_MAX_BITMAP_DIRECTORY_SIZE) { | ||
70 | error_setg(errp, "Not enough space in the bitmap directory"); | ||
71 | goto fail; | ||
72 | } | ||
73 | |||
74 | - qemu_co_mutex_lock(&s->lock); | ||
75 | - bm_list = bitmap_list_load(bs, s->bitmap_directory_offset, | ||
76 | - s->bitmap_directory_size, errp); | ||
77 | - qemu_co_mutex_unlock(&s->lock); | ||
78 | - if (bm_list == NULL) { | ||
79 | - goto fail; | ||
80 | - } | ||
81 | - | ||
82 | - found = find_bitmap_by_name(bm_list, name); | ||
83 | - bitmap_list_free(bm_list); | ||
84 | - if (found) { | ||
85 | - error_setg(errp, "Bitmap with the same name is already stored"); | ||
86 | - goto fail; | ||
87 | - } | ||
88 | - | ||
89 | return true; | ||
90 | |||
91 | fail: | ||
92 | -- | ||
93 | 2.24.1 | ||
94 | |||
95 | diff view generated by jsdifflib |
New patch | |||
---|---|---|---|
1 | Probably due to blind copy-pasting, we have several instances of "qocw2" | ||
2 | in our iotests. Fix them. | ||
1 | 3 | ||
4 | Reported-by: Maxim Levitsky <mlevitsk@redhat.com> | ||
5 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
6 | Message-id: 20191107163708.833192-2-mreitz@redhat.com | ||
7 | Reviewed-by: Eric Blake <eblake@redhat.com> | ||
8 | Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> | ||
9 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
10 | --- | ||
11 | tests/qemu-iotests/060 | 2 +- | ||
12 | tests/qemu-iotests/061 | 2 +- | ||
13 | tests/qemu-iotests/062 | 2 +- | ||
14 | tests/qemu-iotests/066 | 2 +- | ||
15 | tests/qemu-iotests/068 | 2 +- | ||
16 | tests/qemu-iotests/108 | 2 +- | ||
17 | tests/qemu-iotests/138 | 2 +- | ||
18 | tests/qemu-iotests/261 | 2 +- | ||
19 | 8 files changed, 8 insertions(+), 8 deletions(-) | ||
20 | |||
21 | diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060 | ||
22 | index XXXXXXX..XXXXXXX 100755 | ||
23 | --- a/tests/qemu-iotests/060 | ||
24 | +++ b/tests/qemu-iotests/060 | ||
25 | @@ -XXX,XX +XXX,XX @@ _filter_io_error() | ||
26 | . ./common.rc | ||
27 | . ./common.filter | ||
28 | |||
29 | -# This tests qocw2-specific low-level functionality | ||
30 | +# This tests qcow2-specific low-level functionality | ||
31 | _supported_fmt qcow2 | ||
32 | _supported_proto file | ||
33 | _supported_os Linux | ||
34 | diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061 | ||
35 | index XXXXXXX..XXXXXXX 100755 | ||
36 | --- a/tests/qemu-iotests/061 | ||
37 | +++ b/tests/qemu-iotests/061 | ||
38 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
39 | . ./common.rc | ||
40 | . ./common.filter | ||
41 | |||
42 | -# This tests qocw2-specific low-level functionality | ||
43 | +# This tests qcow2-specific low-level functionality | ||
44 | _supported_fmt qcow2 | ||
45 | _supported_proto file | ||
46 | _supported_os Linux | ||
47 | diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062 | ||
48 | index XXXXXXX..XXXXXXX 100755 | ||
49 | --- a/tests/qemu-iotests/062 | ||
50 | +++ b/tests/qemu-iotests/062 | ||
51 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
52 | . ./common.rc | ||
53 | . ./common.filter | ||
54 | |||
55 | -# This tests qocw2-specific low-level functionality | ||
56 | +# This tests qcow2-specific low-level functionality | ||
57 | _supported_fmt qcow2 | ||
58 | _supported_proto generic | ||
59 | |||
60 | diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066 | ||
61 | index XXXXXXX..XXXXXXX 100755 | ||
62 | --- a/tests/qemu-iotests/066 | ||
63 | +++ b/tests/qemu-iotests/066 | ||
64 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
65 | . ./common.rc | ||
66 | . ./common.filter | ||
67 | |||
68 | -# This tests qocw2-specific low-level functionality | ||
69 | +# This tests qcow2-specific low-level functionality | ||
70 | _supported_fmt qcow2 | ||
71 | _supported_proto generic | ||
72 | |||
73 | diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068 | ||
74 | index XXXXXXX..XXXXXXX 100755 | ||
75 | --- a/tests/qemu-iotests/068 | ||
76 | +++ b/tests/qemu-iotests/068 | ||
77 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
78 | . ./common.rc | ||
79 | . ./common.filter | ||
80 | |||
81 | -# This tests qocw2-specific low-level functionality | ||
82 | +# This tests qcow2-specific low-level functionality | ||
83 | _supported_fmt qcow2 | ||
84 | _supported_proto generic | ||
85 | |||
86 | diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108 | ||
87 | index XXXXXXX..XXXXXXX 100755 | ||
88 | --- a/tests/qemu-iotests/108 | ||
89 | +++ b/tests/qemu-iotests/108 | ||
90 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
91 | . ./common.rc | ||
92 | . ./common.filter | ||
93 | |||
94 | -# This tests qocw2-specific low-level functionality | ||
95 | +# This tests qcow2-specific low-level functionality | ||
96 | _supported_fmt qcow2 | ||
97 | _supported_proto file | ||
98 | _supported_os Linux | ||
99 | diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138 | ||
100 | index XXXXXXX..XXXXXXX 100755 | ||
101 | --- a/tests/qemu-iotests/138 | ||
102 | +++ b/tests/qemu-iotests/138 | ||
103 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
104 | . ./common.rc | ||
105 | . ./common.filter | ||
106 | |||
107 | -# This tests qocw2-specific low-level functionality | ||
108 | +# This tests qcow2-specific low-level functionality | ||
109 | _supported_fmt qcow2 | ||
110 | _supported_proto file | ||
111 | _supported_os Linux | ||
112 | diff --git a/tests/qemu-iotests/261 b/tests/qemu-iotests/261 | ||
113 | index XXXXXXX..XXXXXXX 100755 | ||
114 | --- a/tests/qemu-iotests/261 | ||
115 | +++ b/tests/qemu-iotests/261 | ||
116 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
117 | . ./common.rc | ||
118 | . ./common.filter | ||
119 | |||
120 | -# This tests qocw2-specific low-level functionality | ||
121 | +# This tests qcow2-specific low-level functionality | ||
122 | _supported_fmt qcow2 | ||
123 | _supported_proto file | ||
124 | _supported_os Linux | ||
125 | -- | ||
126 | 2.24.1 | ||
127 | |||
128 | diff view generated by jsdifflib |
New patch | |||
---|---|---|---|
1 | This is useful for tests that want to whitelist fields from dump-header | ||
2 | (with grep) but still print all header extensions. | ||
1 | 3 | ||
4 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
5 | Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> | ||
6 | Message-id: 20191107163708.833192-3-mreitz@redhat.com | ||
7 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
8 | --- | ||
9 | tests/qemu-iotests/qcow2.py | 5 +++++ | ||
10 | 1 file changed, 5 insertions(+) | ||
11 | |||
12 | diff --git a/tests/qemu-iotests/qcow2.py b/tests/qemu-iotests/qcow2.py | ||
13 | index XXXXXXX..XXXXXXX 100755 | ||
14 | --- a/tests/qemu-iotests/qcow2.py | ||
15 | +++ b/tests/qemu-iotests/qcow2.py | ||
16 | @@ -XXX,XX +XXX,XX @@ def cmd_dump_header(fd): | ||
17 | h.dump() | ||
18 | h.dump_extensions() | ||
19 | |||
20 | +def cmd_dump_header_exts(fd): | ||
21 | + h = QcowHeader(fd) | ||
22 | + h.dump_extensions() | ||
23 | + | ||
24 | def cmd_set_header(fd, name, value): | ||
25 | try: | ||
26 | value = int(value, 0) | ||
27 | @@ -XXX,XX +XXX,XX @@ def cmd_set_feature_bit(fd, group, bit): | ||
28 | |||
29 | cmds = [ | ||
30 | [ 'dump-header', cmd_dump_header, 0, 'Dump image header and header extensions' ], | ||
31 | + [ 'dump-header-exts', cmd_dump_header_exts, 0, 'Dump image header extensions' ], | ||
32 | [ 'set-header', cmd_set_header, 2, 'Set a field in the header'], | ||
33 | [ 'add-header-ext', cmd_add_header_ext, 2, 'Add a header extension' ], | ||
34 | [ 'add-header-ext-stdio', cmd_add_header_ext_stdio, 1, 'Add a header extension, data from stdin' ], | ||
35 | -- | ||
36 | 2.24.1 | ||
37 | |||
38 | diff view generated by jsdifflib |
New patch | |||
---|---|---|---|
1 | Print the feature fields as a set of bits so that filtering is easier. | ||
1 | 2 | ||
3 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
4 | Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> | ||
5 | Message-id: 20191107163708.833192-4-mreitz@redhat.com | ||
6 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
7 | --- | ||
8 | tests/qemu-iotests/031.out | 36 +++++++++---------- | ||
9 | tests/qemu-iotests/036.out | 18 +++++----- | ||
10 | tests/qemu-iotests/039.out | 22 ++++++------ | ||
11 | tests/qemu-iotests/060.out | 20 +++++------ | ||
12 | tests/qemu-iotests/061.out | 72 ++++++++++++++++++------------------- | ||
13 | tests/qemu-iotests/137.out | 2 +- | ||
14 | tests/qemu-iotests/qcow2.py | 18 +++++++--- | ||
15 | 7 files changed, 99 insertions(+), 89 deletions(-) | ||
16 | |||
17 | diff --git a/tests/qemu-iotests/031.out b/tests/qemu-iotests/031.out | ||
18 | index XXXXXXX..XXXXXXX 100644 | ||
19 | --- a/tests/qemu-iotests/031.out | ||
20 | +++ b/tests/qemu-iotests/031.out | ||
21 | @@ -XXX,XX +XXX,XX @@ refcount_table_offset 0x10000 | ||
22 | refcount_table_clusters 1 | ||
23 | nb_snapshots 0 | ||
24 | snapshot_offset 0x0 | ||
25 | -incompatible_features 0x0 | ||
26 | -compatible_features 0x0 | ||
27 | -autoclear_features 0x0 | ||
28 | +incompatible_features [] | ||
29 | +compatible_features [] | ||
30 | +autoclear_features [] | ||
31 | refcount_order 4 | ||
32 | header_length 72 | ||
33 | |||
34 | @@ -XXX,XX +XXX,XX @@ refcount_table_offset 0x10000 | ||
35 | refcount_table_clusters 1 | ||
36 | nb_snapshots 0 | ||
37 | snapshot_offset 0x0 | ||
38 | -incompatible_features 0x0 | ||
39 | -compatible_features 0x0 | ||
40 | -autoclear_features 0x0 | ||
41 | +incompatible_features [] | ||
42 | +compatible_features [] | ||
43 | +autoclear_features [] | ||
44 | refcount_order 4 | ||
45 | header_length 72 | ||
46 | |||
47 | @@ -XXX,XX +XXX,XX @@ refcount_table_offset 0x10000 | ||
48 | refcount_table_clusters 1 | ||
49 | nb_snapshots 0 | ||
50 | snapshot_offset 0x0 | ||
51 | -incompatible_features 0x0 | ||
52 | -compatible_features 0x0 | ||
53 | -autoclear_features 0x0 | ||
54 | +incompatible_features [] | ||
55 | +compatible_features [] | ||
56 | +autoclear_features [] | ||
57 | refcount_order 4 | ||
58 | header_length 72 | ||
59 | |||
60 | @@ -XXX,XX +XXX,XX @@ refcount_table_offset 0x10000 | ||
61 | refcount_table_clusters 1 | ||
62 | nb_snapshots 0 | ||
63 | snapshot_offset 0x0 | ||
64 | -incompatible_features 0x0 | ||
65 | -compatible_features 0x0 | ||
66 | -autoclear_features 0x0 | ||
67 | +incompatible_features [] | ||
68 | +compatible_features [] | ||
69 | +autoclear_features [] | ||
70 | refcount_order 4 | ||
71 | header_length 104 | ||
72 | |||
73 | @@ -XXX,XX +XXX,XX @@ refcount_table_offset 0x10000 | ||
74 | refcount_table_clusters 1 | ||
75 | nb_snapshots 0 | ||
76 | snapshot_offset 0x0 | ||
77 | -incompatible_features 0x0 | ||
78 | -compatible_features 0x0 | ||
79 | -autoclear_features 0x0 | ||
80 | +incompatible_features [] | ||
81 | +compatible_features [] | ||
82 | +autoclear_features [] | ||
83 | refcount_order 4 | ||
84 | header_length 104 | ||
85 | |||
86 | @@ -XXX,XX +XXX,XX @@ refcount_table_offset 0x10000 | ||
87 | refcount_table_clusters 1 | ||
88 | nb_snapshots 0 | ||
89 | snapshot_offset 0x0 | ||
90 | -incompatible_features 0x0 | ||
91 | -compatible_features 0x0 | ||
92 | -autoclear_features 0x0 | ||
93 | +incompatible_features [] | ||
94 | +compatible_features [] | ||
95 | +autoclear_features [] | ||
96 | refcount_order 4 | ||
97 | header_length 104 | ||
98 | |||
99 | diff --git a/tests/qemu-iotests/036.out b/tests/qemu-iotests/036.out | ||
100 | index XXXXXXX..XXXXXXX 100644 | ||
101 | --- a/tests/qemu-iotests/036.out | ||
102 | +++ b/tests/qemu-iotests/036.out | ||
103 | @@ -XXX,XX +XXX,XX @@ refcount_table_offset 0x10000 | ||
104 | refcount_table_clusters 1 | ||
105 | nb_snapshots 0 | ||
106 | snapshot_offset 0x0 | ||
107 | -incompatible_features 0x8000000000000000 | ||
108 | -compatible_features 0x0 | ||
109 | -autoclear_features 0x0 | ||
110 | +incompatible_features [63] | ||
111 | +compatible_features [] | ||
112 | +autoclear_features [] | ||
113 | refcount_order 4 | ||
114 | header_length 104 | ||
115 | |||
116 | @@ -XXX,XX +XXX,XX @@ refcount_table_offset 0x10000 | ||
117 | refcount_table_clusters 1 | ||
118 | nb_snapshots 0 | ||
119 | snapshot_offset 0x0 | ||
120 | -incompatible_features 0x0 | ||
121 | -compatible_features 0x0 | ||
122 | -autoclear_features 0x8000000000000000 | ||
123 | +incompatible_features [] | ||
124 | +compatible_features [] | ||
125 | +autoclear_features [63] | ||
126 | refcount_order 4 | ||
127 | header_length 104 | ||
128 | |||
129 | @@ -XXX,XX +XXX,XX @@ refcount_table_offset 0x10000 | ||
130 | refcount_table_clusters 1 | ||
131 | nb_snapshots 0 | ||
132 | snapshot_offset 0x0 | ||
133 | -incompatible_features 0x0 | ||
134 | -compatible_features 0x0 | ||
135 | -autoclear_features 0x0 | ||
136 | +incompatible_features [] | ||
137 | +compatible_features [] | ||
138 | +autoclear_features [] | ||
139 | refcount_order 4 | ||
140 | header_length 104 | ||
141 | |||
142 | diff --git a/tests/qemu-iotests/039.out b/tests/qemu-iotests/039.out | ||
143 | index XXXXXXX..XXXXXXX 100644 | ||
144 | --- a/tests/qemu-iotests/039.out | ||
145 | +++ b/tests/qemu-iotests/039.out | ||
146 | @@ -XXX,XX +XXX,XX @@ QA output created by 039 | ||
147 | Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 | ||
148 | wrote 512/512 bytes at offset 0 | ||
149 | 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
150 | -incompatible_features 0x0 | ||
151 | +incompatible_features [] | ||
152 | No errors were found on the image. | ||
153 | |||
154 | == Creating a dirty image file == | ||
155 | @@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 | ||
156 | wrote 512/512 bytes at offset 0 | ||
157 | 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
158 | ./common.rc: Killed ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" ) | ||
159 | -incompatible_features 0x1 | ||
160 | +incompatible_features [0] | ||
161 | ERROR cluster 5 refcount=0 reference=1 | ||
162 | ERROR OFLAG_COPIED data cluster: l2_entry=8000000000050000 refcount=0 | ||
163 | |||
164 | @@ -XXX,XX +XXX,XX @@ Data may be corrupted, or further writes to the image may corrupt it. | ||
165 | == Read-only access must still work == | ||
166 | read 512/512 bytes at offset 0 | ||
167 | 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
168 | -incompatible_features 0x1 | ||
169 | +incompatible_features [0] | ||
170 | |||
171 | == Repairing the image file must succeed == | ||
172 | ERROR cluster 5 refcount=0 reference=1 | ||
173 | @@ -XXX,XX +XXX,XX @@ The following inconsistencies were found and repaired: | ||
174 | |||
175 | Double checking the fixed image now... | ||
176 | No errors were found on the image. | ||
177 | -incompatible_features 0x0 | ||
178 | +incompatible_features [] | ||
179 | |||
180 | == Data should still be accessible after repair == | ||
181 | read 512/512 bytes at offset 0 | ||
182 | @@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 | ||
183 | wrote 512/512 bytes at offset 0 | ||
184 | 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
185 | ./common.rc: Killed ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" ) | ||
186 | -incompatible_features 0x1 | ||
187 | +incompatible_features [0] | ||
188 | ERROR cluster 5 refcount=0 reference=1 | ||
189 | Rebuilding refcount structure | ||
190 | Repairing cluster 1 refcount=1 reference=0 | ||
191 | Repairing cluster 2 refcount=1 reference=0 | ||
192 | wrote 512/512 bytes at offset 0 | ||
193 | 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
194 | -incompatible_features 0x0 | ||
195 | +incompatible_features [] | ||
196 | |||
197 | == Creating an image file with lazy_refcounts=off == | ||
198 | Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 | ||
199 | wrote 512/512 bytes at offset 0 | ||
200 | 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
201 | ./common.rc: Killed ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" ) | ||
202 | -incompatible_features 0x0 | ||
203 | +incompatible_features [] | ||
204 | No errors were found on the image. | ||
205 | |||
206 | == Committing to a backing file with lazy_refcounts=on == | ||
207 | @@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/ | ||
208 | wrote 512/512 bytes at offset 0 | ||
209 | 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
210 | Image committed. | ||
211 | -incompatible_features 0x0 | ||
212 | -incompatible_features 0x0 | ||
213 | +incompatible_features [] | ||
214 | +incompatible_features [] | ||
215 | No errors were found on the image. | ||
216 | No errors were found on the image. | ||
217 | |||
218 | @@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 | ||
219 | wrote 512/512 bytes at offset 0 | ||
220 | 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
221 | ./common.rc: Killed ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" ) | ||
222 | -incompatible_features 0x1 | ||
223 | +incompatible_features [0] | ||
224 | ERROR cluster 5 refcount=0 reference=1 | ||
225 | ERROR OFLAG_COPIED data cluster: l2_entry=8000000000050000 refcount=0 | ||
226 | |||
227 | @@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 | ||
228 | wrote 512/512 bytes at offset 0 | ||
229 | 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
230 | ./common.rc: Killed ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" ) | ||
231 | -incompatible_features 0x0 | ||
232 | +incompatible_features [] | ||
233 | No errors were found on the image. | ||
234 | *** done | ||
235 | diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out | ||
236 | index XXXXXXX..XXXXXXX 100644 | ||
237 | --- a/tests/qemu-iotests/060.out | ||
238 | +++ b/tests/qemu-iotests/060.out | ||
239 | @@ -XXX,XX +XXX,XX @@ ERROR cluster 3 refcount=1 reference=3 | ||
240 | |||
241 | 1 errors were found on the image. | ||
242 | Data may be corrupted, or further writes to the image may corrupt it. | ||
243 | -incompatible_features 0x0 | ||
244 | +incompatible_features [] | ||
245 | qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with active L1 table); further corruption events will be suppressed | ||
246 | write failed: Input/output error | ||
247 | -incompatible_features 0x2 | ||
248 | +incompatible_features [1] | ||
249 | image: TEST_DIR/t.IMGFMT | ||
250 | file format: IMGFMT | ||
251 | virtual size: 64 MiB (67108864 bytes) | ||
252 | @@ -XXX,XX +XXX,XX @@ ERROR cluster 2 refcount=1 reference=2 | ||
253 | |||
254 | 2 errors were found on the image. | ||
255 | Data may be corrupted, or further writes to the image may corrupt it. | ||
256 | -incompatible_features 0x0 | ||
257 | +incompatible_features [] | ||
258 | qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with refcount block); further corruption events will be suppressed | ||
259 | write failed: Input/output error | ||
260 | -incompatible_features 0x2 | ||
261 | +incompatible_features [1] | ||
262 | ERROR refcount block 0 refcount=2 | ||
263 | ERROR cluster 2 refcount=1 reference=2 | ||
264 | Rebuilding refcount structure | ||
265 | @@ -XXX,XX +XXX,XX @@ The following inconsistencies were found and repaired: | ||
266 | |||
267 | Double checking the fixed image now... | ||
268 | No errors were found on the image. | ||
269 | -incompatible_features 0x0 | ||
270 | +incompatible_features [] | ||
271 | wrote 512/512 bytes at offset 0 | ||
272 | 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
273 | -incompatible_features 0x0 | ||
274 | +incompatible_features [] | ||
275 | |||
276 | === Testing cluster data reference into inactive L2 table === | ||
277 | |||
278 | @@ -XXX,XX +XXX,XX @@ Data may be corrupted, or further writes to the image may corrupt it. | ||
279 | |||
280 | 1 leaked clusters were found on the image. | ||
281 | This means waste of disk space, but no harm to data. | ||
282 | -incompatible_features 0x0 | ||
283 | +incompatible_features [] | ||
284 | qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with inactive L2 table); further corruption events will be suppressed | ||
285 | write failed: Input/output error | ||
286 | -incompatible_features 0x2 | ||
287 | +incompatible_features [1] | ||
288 | ERROR cluster 4 refcount=1 reference=2 | ||
289 | Leaked cluster 9 refcount=1 reference=0 | ||
290 | Repairing cluster 4 refcount=1 reference=2 | ||
291 | @@ -XXX,XX +XXX,XX @@ The following inconsistencies were found and repaired: | ||
292 | |||
293 | Double checking the fixed image now... | ||
294 | No errors were found on the image. | ||
295 | -incompatible_features 0x0 | ||
296 | +incompatible_features [] | ||
297 | wrote 512/512 bytes at offset 0 | ||
298 | 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
299 | -incompatible_features 0x0 | ||
300 | +incompatible_features [] | ||
301 | read 512/512 bytes at offset 0 | ||
302 | 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
303 | No errors were found on the image. | ||
304 | diff --git a/tests/qemu-iotests/061.out b/tests/qemu-iotests/061.out | ||
305 | index XXXXXXX..XXXXXXX 100644 | ||
306 | --- a/tests/qemu-iotests/061.out | ||
307 | +++ b/tests/qemu-iotests/061.out | ||
308 | @@ -XXX,XX +XXX,XX @@ refcount_table_offset 0x10000 | ||
309 | refcount_table_clusters 1 | ||
310 | nb_snapshots 0 | ||
311 | snapshot_offset 0x0 | ||
312 | -incompatible_features 0x0 | ||
313 | -compatible_features 0x1 | ||
314 | -autoclear_features 0x0 | ||
315 | +incompatible_features [] | ||
316 | +compatible_features [0] | ||
317 | +autoclear_features [] | ||
318 | refcount_order 4 | ||
319 | header_length 104 | ||
320 | |||
321 | @@ -XXX,XX +XXX,XX @@ refcount_table_offset 0x10000 | ||
322 | refcount_table_clusters 1 | ||
323 | nb_snapshots 0 | ||
324 | snapshot_offset 0x0 | ||
325 | -incompatible_features 0x0 | ||
326 | -compatible_features 0x0 | ||
327 | -autoclear_features 0x0 | ||
328 | +incompatible_features [] | ||
329 | +compatible_features [] | ||
330 | +autoclear_features [] | ||
331 | refcount_order 4 | ||
332 | header_length 72 | ||
333 | |||
334 | @@ -XXX,XX +XXX,XX @@ refcount_table_offset 0x10000 | ||
335 | refcount_table_clusters 1 | ||
336 | nb_snapshots 0 | ||
337 | snapshot_offset 0x0 | ||
338 | -incompatible_features 0x0 | ||
339 | -compatible_features 0x1 | ||
340 | -autoclear_features 0x0 | ||
341 | +incompatible_features [] | ||
342 | +compatible_features [0] | ||
343 | +autoclear_features [] | ||
344 | refcount_order 4 | ||
345 | header_length 104 | ||
346 | |||
347 | @@ -XXX,XX +XXX,XX @@ refcount_table_offset 0x10000 | ||
348 | refcount_table_clusters 1 | ||
349 | nb_snapshots 0 | ||
350 | snapshot_offset 0x0 | ||
351 | -incompatible_features 0x0 | ||
352 | -compatible_features 0x0 | ||
353 | -autoclear_features 0x0 | ||
354 | +incompatible_features [] | ||
355 | +compatible_features [] | ||
356 | +autoclear_features [] | ||
357 | refcount_order 4 | ||
358 | header_length 72 | ||
359 | |||
360 | @@ -XXX,XX +XXX,XX @@ refcount_table_offset 0x10000 | ||
361 | refcount_table_clusters 1 | ||
362 | nb_snapshots 0 | ||
363 | snapshot_offset 0x0 | ||
364 | -incompatible_features 0x1 | ||
365 | -compatible_features 0x1 | ||
366 | -autoclear_features 0x0 | ||
367 | +incompatible_features [0] | ||
368 | +compatible_features [0] | ||
369 | +autoclear_features [] | ||
370 | refcount_order 4 | ||
371 | header_length 104 | ||
372 | |||
373 | @@ -XXX,XX +XXX,XX @@ refcount_table_offset 0x80000 | ||
374 | refcount_table_clusters 1 | ||
375 | nb_snapshots 0 | ||
376 | snapshot_offset 0x0 | ||
377 | -incompatible_features 0x0 | ||
378 | -compatible_features 0x0 | ||
379 | -autoclear_features 0x0 | ||
380 | +incompatible_features [] | ||
381 | +compatible_features [] | ||
382 | +autoclear_features [] | ||
383 | refcount_order 4 | ||
384 | header_length 72 | ||
385 | |||
386 | @@ -XXX,XX +XXX,XX @@ refcount_table_offset 0x10000 | ||
387 | refcount_table_clusters 1 | ||
388 | nb_snapshots 0 | ||
389 | snapshot_offset 0x0 | ||
390 | -incompatible_features 0x0 | ||
391 | -compatible_features 0x40000000000 | ||
392 | -autoclear_features 0x40000000000 | ||
393 | +incompatible_features [] | ||
394 | +compatible_features [42] | ||
395 | +autoclear_features [42] | ||
396 | refcount_order 4 | ||
397 | header_length 104 | ||
398 | |||
399 | @@ -XXX,XX +XXX,XX @@ refcount_table_offset 0x10000 | ||
400 | refcount_table_clusters 1 | ||
401 | nb_snapshots 0 | ||
402 | snapshot_offset 0x0 | ||
403 | -incompatible_features 0x0 | ||
404 | -compatible_features 0x0 | ||
405 | -autoclear_features 0x0 | ||
406 | +incompatible_features [] | ||
407 | +compatible_features [] | ||
408 | +autoclear_features [] | ||
409 | refcount_order 4 | ||
410 | header_length 72 | ||
411 | |||
412 | @@ -XXX,XX +XXX,XX @@ refcount_table_offset 0x10000 | ||
413 | refcount_table_clusters 1 | ||
414 | nb_snapshots 0 | ||
415 | snapshot_offset 0x0 | ||
416 | -incompatible_features 0x0 | ||
417 | -compatible_features 0x0 | ||
418 | -autoclear_features 0x0 | ||
419 | +incompatible_features [] | ||
420 | +compatible_features [] | ||
421 | +autoclear_features [] | ||
422 | refcount_order 4 | ||
423 | header_length 72 | ||
424 | |||
425 | @@ -XXX,XX +XXX,XX @@ refcount_table_offset 0x10000 | ||
426 | refcount_table_clusters 1 | ||
427 | nb_snapshots 0 | ||
428 | snapshot_offset 0x0 | ||
429 | -incompatible_features 0x0 | ||
430 | -compatible_features 0x1 | ||
431 | -autoclear_features 0x0 | ||
432 | +incompatible_features [] | ||
433 | +compatible_features [0] | ||
434 | +autoclear_features [] | ||
435 | refcount_order 4 | ||
436 | header_length 104 | ||
437 | |||
438 | @@ -XXX,XX +XXX,XX @@ refcount_table_offset 0x10000 | ||
439 | refcount_table_clusters 1 | ||
440 | nb_snapshots 0 | ||
441 | snapshot_offset 0x0 | ||
442 | -incompatible_features 0x1 | ||
443 | -compatible_features 0x1 | ||
444 | -autoclear_features 0x0 | ||
445 | +incompatible_features [0] | ||
446 | +compatible_features [0] | ||
447 | +autoclear_features [] | ||
448 | refcount_order 4 | ||
449 | header_length 104 | ||
450 | |||
451 | @@ -XXX,XX +XXX,XX @@ refcount_table_offset 0x80000 | ||
452 | refcount_table_clusters 1 | ||
453 | nb_snapshots 0 | ||
454 | snapshot_offset 0x0 | ||
455 | -incompatible_features 0x0 | ||
456 | -compatible_features 0x0 | ||
457 | -autoclear_features 0x0 | ||
458 | +incompatible_features [] | ||
459 | +compatible_features [] | ||
460 | +autoclear_features [] | ||
461 | refcount_order 4 | ||
462 | header_length 104 | ||
463 | |||
464 | diff --git a/tests/qemu-iotests/137.out b/tests/qemu-iotests/137.out | ||
465 | index XXXXXXX..XXXXXXX 100644 | ||
466 | --- a/tests/qemu-iotests/137.out | ||
467 | +++ b/tests/qemu-iotests/137.out | ||
468 | @@ -XXX,XX +XXX,XX @@ qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are | ||
469 | wrote 512/512 bytes at offset 0 | ||
470 | 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
471 | ./common.rc: Killed ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" ) | ||
472 | -incompatible_features 0x0 | ||
473 | +incompatible_features [] | ||
474 | Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 | ||
475 | wrote 65536/65536 bytes at offset 0 | ||
476 | 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
477 | diff --git a/tests/qemu-iotests/qcow2.py b/tests/qemu-iotests/qcow2.py | ||
478 | index XXXXXXX..XXXXXXX 100755 | ||
479 | --- a/tests/qemu-iotests/qcow2.py | ||
480 | +++ b/tests/qemu-iotests/qcow2.py | ||
481 | @@ -XXX,XX +XXX,XX @@ class QcowHeader: | ||
482 | [ uint64_t, '%#x', 'snapshot_offset' ], | ||
483 | |||
484 | # Version 3 header fields | ||
485 | - [ uint64_t, '%#x', 'incompatible_features' ], | ||
486 | - [ uint64_t, '%#x', 'compatible_features' ], | ||
487 | - [ uint64_t, '%#x', 'autoclear_features' ], | ||
488 | + [ uint64_t, 'mask', 'incompatible_features' ], | ||
489 | + [ uint64_t, 'mask', 'compatible_features' ], | ||
490 | + [ uint64_t, 'mask', 'autoclear_features' ], | ||
491 | [ uint32_t, '%d', 'refcount_order' ], | ||
492 | [ uint32_t, '%d', 'header_length' ], | ||
493 | ]; | ||
494 | @@ -XXX,XX +XXX,XX @@ class QcowHeader: | ||
495 | |||
496 | def dump(self): | ||
497 | for f in QcowHeader.fields: | ||
498 | - print("%-25s" % f[2], f[1] % self.__dict__[f[2]]) | ||
499 | + value = self.__dict__[f[2]] | ||
500 | + if f[1] == 'mask': | ||
501 | + bits = [] | ||
502 | + for bit in range(64): | ||
503 | + if value & (1 << bit): | ||
504 | + bits.append(bit) | ||
505 | + value_str = str(bits) | ||
506 | + else: | ||
507 | + value_str = f[1] % value | ||
508 | + | ||
509 | + print("%-25s" % f[2], value_str) | ||
510 | print("") | ||
511 | |||
512 | def dump_extensions(self): | ||
513 | -- | ||
514 | 2.24.1 | ||
515 | |||
516 | diff view generated by jsdifflib |
1 | From: Nir Soffer <nirsof@gmail.com> | 1 | Signed-off-by: Max Reitz <mreitz@redhat.com> |
---|---|---|---|
2 | 2 | Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> | |
3 | Using block_resize we can test allocate_first_block() with file | 3 | Message-id: 20191107163708.833192-5-mreitz@redhat.com |
4 | descriptor opened with O_DIRECT, ensuring that it works for any size | ||
5 | larger than 4096 bytes. | ||
6 | |||
7 | Testing smaller sizes is tricky as the result depends on the filesystem | ||
8 | used for testing. For example on NFS any size will work since O_DIRECT | ||
9 | does not require any alignment. | ||
10 | |||
11 | Signed-off-by: Nir Soffer <nsoffer@redhat.com> | ||
12 | Reviewed-by: Max Reitz <mreitz@redhat.com> | ||
13 | Message-id: 20190827010528.8818-3-nsoffer@redhat.com | ||
14 | Signed-off-by: Max Reitz <mreitz@redhat.com> | 4 | Signed-off-by: Max Reitz <mreitz@redhat.com> |
15 | --- | 5 | --- |
16 | tests/qemu-iotests/175 | 28 ++++++++++++++++++++++++++++ | 6 | tests/qemu-iotests/common.filter | 24 ++++++++++++++++++++++++ |
17 | tests/qemu-iotests/175.out | 8 ++++++++ | 7 | 1 file changed, 24 insertions(+) |
18 | 2 files changed, 36 insertions(+) | ||
19 | 8 | ||
20 | diff --git a/tests/qemu-iotests/175 b/tests/qemu-iotests/175 | 9 | diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter |
21 | index XXXXXXX..XXXXXXX 100755 | 10 | index XXXXXXX..XXXXXXX 100644 |
22 | --- a/tests/qemu-iotests/175 | 11 | --- a/tests/qemu-iotests/common.filter |
23 | +++ b/tests/qemu-iotests/175 | 12 | +++ b/tests/qemu-iotests/common.filter |
24 | @@ -XXX,XX +XXX,XX @@ _filter_blocks() | 13 | @@ -XXX,XX +XXX,XX @@ _filter_qmp_empty_return() |
25 | -e "s/blocks=$((extra_blocks + img_size / 512))\\(\$\\|[^0-9]\\)/max allocation/" | 14 | grep -v '{"return": {}}' |
26 | } | 15 | } |
27 | 16 | ||
28 | +# Resize image using block_resize. | 17 | +_filter_json_filename() |
29 | +# Parameter 1: image path | ||
30 | +# Parameter 2: new size | ||
31 | +_block_resize() | ||
32 | +{ | 18 | +{ |
33 | + local path=$1 | 19 | + $PYTHON -c 'import sys |
34 | + local size=$2 | 20 | +result, *fnames = sys.stdin.read().split("json:{") |
21 | +depth = 0 | ||
22 | +for fname in fnames: | ||
23 | + depth += 1 # For the opening brace in the split separator | ||
24 | + for chr_i, chr in enumerate(fname): | ||
25 | + if chr == "{": | ||
26 | + depth += 1 | ||
27 | + elif chr == "}": | ||
28 | + depth -= 1 | ||
29 | + if depth == 0: | ||
30 | + break | ||
35 | + | 31 | + |
36 | + $QEMU -qmp stdio -nographic -nodefaults \ | 32 | + # json:{} filenames may be nested; filter out everything from |
37 | + -blockdev file,node-name=file,filename=$path,cache.direct=on \ | 33 | + # inside the outermost one |
38 | + <<EOF | 34 | + if depth == 0: |
39 | +{'execute': 'qmp_capabilities'} | 35 | + chr_i += 1 # First character past the filename |
40 | +{'execute': 'block_resize', 'arguments': {'node-name': 'file', 'size': $size}} | 36 | + result += "json:{ /* filtered */ }" + fname[chr_i:] |
41 | +{'execute': 'quit'} | 37 | + |
42 | +EOF | 38 | +sys.stdout.write(result)' |
43 | +} | 39 | +} |
44 | + | 40 | + |
45 | # get standard environment, filters and checks | 41 | # make sure this script returns success |
46 | . ./common.rc | 42 | true |
47 | . ./common.filter | ||
48 | @@ -XXX,XX +XXX,XX @@ _supported_fmt raw | ||
49 | _supported_proto file | ||
50 | _supported_os Linux | ||
51 | |||
52 | +_default_cache_mode none | ||
53 | +_supported_cache_modes none directsync | ||
54 | + | ||
55 | size=$((1 * 1024 * 1024)) | ||
56 | |||
57 | touch "$TEST_DIR/empty" | ||
58 | @@ -XXX,XX +XXX,XX @@ for mode in off full falloc; do | ||
59 | stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $min_blocks $size | ||
60 | done | ||
61 | |||
62 | +for new_size in 4096 1048576; do | ||
63 | + echo | ||
64 | + echo "== resize empty image with block_resize ==" | ||
65 | + _make_test_img 0 | _filter_imgfmt | ||
66 | + _block_resize $TEST_IMG $new_size >/dev/null | ||
67 | + stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $min_blocks $new_size | ||
68 | +done | ||
69 | + | ||
70 | # success, all done | ||
71 | echo "*** done" | ||
72 | rm -f $seq.full | ||
73 | diff --git a/tests/qemu-iotests/175.out b/tests/qemu-iotests/175.out | ||
74 | index XXXXXXX..XXXXXXX 100644 | ||
75 | --- a/tests/qemu-iotests/175.out | ||
76 | +++ b/tests/qemu-iotests/175.out | ||
77 | @@ -XXX,XX +XXX,XX @@ size=1048576, max allocation | ||
78 | == creating image with preallocation falloc == | ||
79 | Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 preallocation=falloc | ||
80 | size=1048576, max allocation | ||
81 | + | ||
82 | +== resize empty image with block_resize == | ||
83 | +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=0 | ||
84 | +size=4096, min allocation | ||
85 | + | ||
86 | +== resize empty image with block_resize == | ||
87 | +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=0 | ||
88 | +size=1048576, min allocation | ||
89 | *** done | ||
90 | -- | 43 | -- |
91 | 2.21.0 | 44 | 2.24.1 |
92 | 45 | ||
93 | 46 | diff view generated by jsdifflib |
New patch | |||
---|---|---|---|
1 | This test can run just fine with other values for refcount_bits, so we | ||
2 | should filter the value from qcow2.py's dump-header. In fact, we can | ||
3 | filter everything but the feature bits and header extensions, because | ||
4 | that is what the test is about. | ||
1 | 5 | ||
6 | (036 currently ignores user-specified image options, but that will be | ||
7 | fixed in the next patch.) | ||
8 | |||
9 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
10 | Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> | ||
11 | Message-id: 20191107163708.833192-6-mreitz@redhat.com | ||
12 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
13 | --- | ||
14 | tests/qemu-iotests/036 | 9 ++++--- | ||
15 | tests/qemu-iotests/036.out | 48 -------------------------------------- | ||
16 | 2 files changed, 6 insertions(+), 51 deletions(-) | ||
17 | |||
18 | diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036 | ||
19 | index XXXXXXX..XXXXXXX 100755 | ||
20 | --- a/tests/qemu-iotests/036 | ||
21 | +++ b/tests/qemu-iotests/036 | ||
22 | @@ -XXX,XX +XXX,XX @@ $PYTHON qcow2.py "$TEST_IMG" set-feature-bit incompatible 63 | ||
23 | |||
24 | # Without feature table | ||
25 | $PYTHON qcow2.py "$TEST_IMG" del-header-ext 0x6803f857 | ||
26 | -$PYTHON qcow2.py "$TEST_IMG" dump-header | ||
27 | +$PYTHON qcow2.py "$TEST_IMG" dump-header | grep features | ||
28 | +$PYTHON qcow2.py "$TEST_IMG" dump-header-exts | ||
29 | _img_info | ||
30 | |||
31 | # With feature table containing bit 63 | ||
32 | @@ -XXX,XX +XXX,XX @@ echo === Create image with unknown autoclear feature bit === | ||
33 | echo | ||
34 | _make_test_img 64M | ||
35 | $PYTHON qcow2.py "$TEST_IMG" set-feature-bit autoclear 63 | ||
36 | -$PYTHON qcow2.py "$TEST_IMG" dump-header | ||
37 | +$PYTHON qcow2.py "$TEST_IMG" dump-header | grep features | ||
38 | +$PYTHON qcow2.py "$TEST_IMG" dump-header-exts | ||
39 | |||
40 | echo | ||
41 | echo === Repair image === | ||
42 | echo | ||
43 | _check_test_img -r all | ||
44 | |||
45 | -$PYTHON qcow2.py "$TEST_IMG" dump-header | ||
46 | +$PYTHON qcow2.py "$TEST_IMG" dump-header | grep features | ||
47 | +$PYTHON qcow2.py "$TEST_IMG" dump-header-exts | ||
48 | |||
49 | # success, all done | ||
50 | echo "*** done" | ||
51 | diff --git a/tests/qemu-iotests/036.out b/tests/qemu-iotests/036.out | ||
52 | index XXXXXXX..XXXXXXX 100644 | ||
53 | --- a/tests/qemu-iotests/036.out | ||
54 | +++ b/tests/qemu-iotests/036.out | ||
55 | @@ -XXX,XX +XXX,XX @@ QA output created by 036 | ||
56 | === Image with unknown incompatible feature bit === | ||
57 | |||
58 | Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 | ||
59 | -magic 0x514649fb | ||
60 | -version 3 | ||
61 | -backing_file_offset 0x0 | ||
62 | -backing_file_size 0x0 | ||
63 | -cluster_bits 16 | ||
64 | -size 67108864 | ||
65 | -crypt_method 0 | ||
66 | -l1_size 1 | ||
67 | -l1_table_offset 0x30000 | ||
68 | -refcount_table_offset 0x10000 | ||
69 | -refcount_table_clusters 1 | ||
70 | -nb_snapshots 0 | ||
71 | -snapshot_offset 0x0 | ||
72 | incompatible_features [63] | ||
73 | compatible_features [] | ||
74 | autoclear_features [] | ||
75 | -refcount_order 4 | ||
76 | -header_length 104 | ||
77 | - | ||
78 | qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported IMGFMT feature(s): Unknown incompatible feature: 8000000000000000 | ||
79 | qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported IMGFMT feature(s): Test feature | ||
80 | |||
81 | @@ -XXX,XX +XXX,XX @@ qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported IMGFMT feature(s): tes | ||
82 | === Create image with unknown autoclear feature bit === | ||
83 | |||
84 | Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 | ||
85 | -magic 0x514649fb | ||
86 | -version 3 | ||
87 | -backing_file_offset 0x0 | ||
88 | -backing_file_size 0x0 | ||
89 | -cluster_bits 16 | ||
90 | -size 67108864 | ||
91 | -crypt_method 0 | ||
92 | -l1_size 1 | ||
93 | -l1_table_offset 0x30000 | ||
94 | -refcount_table_offset 0x10000 | ||
95 | -refcount_table_clusters 1 | ||
96 | -nb_snapshots 0 | ||
97 | -snapshot_offset 0x0 | ||
98 | incompatible_features [] | ||
99 | compatible_features [] | ||
100 | autoclear_features [63] | ||
101 | -refcount_order 4 | ||
102 | -header_length 104 | ||
103 | - | ||
104 | Header extension: | ||
105 | magic 0x6803f857 | ||
106 | length 192 | ||
107 | @@ -XXX,XX +XXX,XX @@ data <binary> | ||
108 | === Repair image === | ||
109 | |||
110 | No errors were found on the image. | ||
111 | -magic 0x514649fb | ||
112 | -version 3 | ||
113 | -backing_file_offset 0x0 | ||
114 | -backing_file_size 0x0 | ||
115 | -cluster_bits 16 | ||
116 | -size 67108864 | ||
117 | -crypt_method 0 | ||
118 | -l1_size 1 | ||
119 | -l1_table_offset 0x30000 | ||
120 | -refcount_table_offset 0x10000 | ||
121 | -refcount_table_clusters 1 | ||
122 | -nb_snapshots 0 | ||
123 | -snapshot_offset 0x0 | ||
124 | incompatible_features [] | ||
125 | compatible_features [] | ||
126 | autoclear_features [] | ||
127 | -refcount_order 4 | ||
128 | -header_length 104 | ||
129 | - | ||
130 | Header extension: | ||
131 | magic 0x6803f857 | ||
132 | length 192 | ||
133 | -- | ||
134 | 2.24.1 | ||
135 | |||
136 | diff view generated by jsdifflib |
New patch | |||
---|---|---|---|
1 | Some tests require compat=1.1 and thus set IMGOPTS='compat=1.1' | ||
2 | globally. That is not how it should be done; instead, they should | ||
3 | simply set _unsupported_imgopts to compat=0.10 (compat=1.1 is the | ||
4 | default anyway). | ||
1 | 5 | ||
6 | This makes the tests heed user-specified $IMGOPTS. Some do not work | ||
7 | with all image options, though, so we need to disable them accordingly. | ||
8 | |||
9 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
10 | Reviewed-by: Maxim Levitsky <mlevitsky@redhat.com> | ||
11 | Message-id: 20191107163708.833192-7-mreitz@redhat.com | ||
12 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
13 | --- | ||
14 | tests/qemu-iotests/036 | 3 +-- | ||
15 | tests/qemu-iotests/060 | 4 ++-- | ||
16 | tests/qemu-iotests/062 | 3 ++- | ||
17 | tests/qemu-iotests/066 | 3 ++- | ||
18 | tests/qemu-iotests/068 | 3 ++- | ||
19 | tests/qemu-iotests/098 | 4 ++-- | ||
20 | 6 files changed, 11 insertions(+), 9 deletions(-) | ||
21 | |||
22 | diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036 | ||
23 | index XXXXXXX..XXXXXXX 100755 | ||
24 | --- a/tests/qemu-iotests/036 | ||
25 | +++ b/tests/qemu-iotests/036 | ||
26 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
27 | # This tests qcow2-specific low-level functionality | ||
28 | _supported_fmt qcow2 | ||
29 | _supported_proto file | ||
30 | - | ||
31 | # Only qcow2v3 and later supports feature bits | ||
32 | -IMGOPTS="compat=1.1" | ||
33 | +_unsupported_imgopts 'compat=0.10' | ||
34 | |||
35 | echo | ||
36 | echo === Image with unknown incompatible feature bit === | ||
37 | diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060 | ||
38 | index XXXXXXX..XXXXXXX 100755 | ||
39 | --- a/tests/qemu-iotests/060 | ||
40 | +++ b/tests/qemu-iotests/060 | ||
41 | @@ -XXX,XX +XXX,XX @@ _filter_io_error() | ||
42 | _supported_fmt qcow2 | ||
43 | _supported_proto file | ||
44 | _supported_os Linux | ||
45 | +# These tests only work for compat=1.1 images with refcount_bits=16 | ||
46 | +_unsupported_imgopts 'compat=0.10' 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' | ||
47 | |||
48 | # The repair process will create a large file - so check for availability first | ||
49 | _require_large_file 64G | ||
50 | @@ -XXX,XX +XXX,XX @@ l1_offset=196608 # 0x30000 (XXX: just an assumption) | ||
51 | l2_offset=262144 # 0x40000 (XXX: just an assumption) | ||
52 | l2_offset_after_snapshot=524288 # 0x80000 (XXX: just an assumption) | ||
53 | |||
54 | -IMGOPTS="compat=1.1" | ||
55 | - | ||
56 | OPEN_RW="open -o overlap-check=all $TEST_IMG" | ||
57 | # Overlap checks are done before write operations only, therefore opening an | ||
58 | # image read-only makes the overlap-check option irrelevant | ||
59 | diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062 | ||
60 | index XXXXXXX..XXXXXXX 100755 | ||
61 | --- a/tests/qemu-iotests/062 | ||
62 | +++ b/tests/qemu-iotests/062 | ||
63 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
64 | # This tests qcow2-specific low-level functionality | ||
65 | _supported_fmt qcow2 | ||
66 | _supported_proto generic | ||
67 | +# We need zero clusters and snapshots | ||
68 | +_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]' | ||
69 | |||
70 | -IMGOPTS="compat=1.1" | ||
71 | IMG_SIZE=64M | ||
72 | |||
73 | echo | ||
74 | diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066 | ||
75 | index XXXXXXX..XXXXXXX 100755 | ||
76 | --- a/tests/qemu-iotests/066 | ||
77 | +++ b/tests/qemu-iotests/066 | ||
78 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
79 | # This tests qcow2-specific low-level functionality | ||
80 | _supported_fmt qcow2 | ||
81 | _supported_proto generic | ||
82 | +# We need zero clusters and snapshots | ||
83 | +_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]' | ||
84 | |||
85 | # Intentionally create an unaligned image | ||
86 | -IMGOPTS="compat=1.1" | ||
87 | IMG_SIZE=$((64 * 1024 * 1024 + 512)) | ||
88 | |||
89 | echo | ||
90 | diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068 | ||
91 | index XXXXXXX..XXXXXXX 100755 | ||
92 | --- a/tests/qemu-iotests/068 | ||
93 | +++ b/tests/qemu-iotests/068 | ||
94 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
95 | # This tests qcow2-specific low-level functionality | ||
96 | _supported_fmt qcow2 | ||
97 | _supported_proto generic | ||
98 | +# Internal snapshots are (currently) impossible with refcount_bits=1 | ||
99 | +_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]' | ||
100 | |||
101 | -IMGOPTS="compat=1.1" | ||
102 | IMG_SIZE=128K | ||
103 | |||
104 | case "$QEMU_DEFAULT_MACHINE" in | ||
105 | diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098 | ||
106 | index XXXXXXX..XXXXXXX 100755 | ||
107 | --- a/tests/qemu-iotests/098 | ||
108 | +++ b/tests/qemu-iotests/098 | ||
109 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
110 | |||
111 | _supported_fmt qcow2 | ||
112 | _supported_proto file | ||
113 | - | ||
114 | -IMGOPTS="compat=1.1" | ||
115 | +# The code path we want to test here only works for compat=1.1 images | ||
116 | +_unsupported_imgopts 'compat=0.10' | ||
117 | |||
118 | for event in l1_update empty_image_prepare reftable_update refblock_alloc; do | ||
119 | |||
120 | -- | ||
121 | 2.24.1 | ||
122 | |||
123 | diff view generated by jsdifflib |
New patch | |||
---|---|---|---|
1 | IMGOPTS can never be empty for qcow2, because the check scripts adds | ||
2 | compat=1.1 unless the user specified any compat option themselves. | ||
3 | Thus, this block does not do anything and can be dropped. | ||
1 | 4 | ||
5 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
6 | Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> | ||
7 | Message-id: 20191107163708.833192-8-mreitz@redhat.com | ||
8 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
9 | --- | ||
10 | tests/qemu-iotests/050 | 4 ---- | ||
11 | 1 file changed, 4 deletions(-) | ||
12 | |||
13 | diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050 | ||
14 | index XXXXXXX..XXXXXXX 100755 | ||
15 | --- a/tests/qemu-iotests/050 | ||
16 | +++ b/tests/qemu-iotests/050 | ||
17 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
18 | _supported_fmt qcow2 qed | ||
19 | _supported_proto file | ||
20 | |||
21 | -if test "$IMGFMT" = qcow2 && test $IMGOPTS = ""; then | ||
22 | - IMGOPTS=compat=1.1 | ||
23 | -fi | ||
24 | - | ||
25 | echo | ||
26 | echo "== Creating images ==" | ||
27 | |||
28 | -- | ||
29 | 2.24.1 | ||
30 | |||
31 | diff view generated by jsdifflib |
New patch | |||
---|---|---|---|
1 | This will allow us to add more options than just -b. | ||
1 | 2 | ||
3 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
4 | Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> | ||
5 | Message-id: 20191107163708.833192-9-mreitz@redhat.com | ||
6 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
7 | --- | ||
8 | tests/qemu-iotests/common.rc | 28 ++++++++++++++++++++-------- | ||
9 | 1 file changed, 20 insertions(+), 8 deletions(-) | ||
10 | |||
11 | diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc | ||
12 | index XXXXXXX..XXXXXXX 100644 | ||
13 | --- a/tests/qemu-iotests/common.rc | ||
14 | +++ b/tests/qemu-iotests/common.rc | ||
15 | @@ -XXX,XX +XXX,XX @@ _make_test_img() | ||
16 | # extra qemu-img options can be added by tests | ||
17 | # at least one argument (the image size) needs to be added | ||
18 | local extra_img_options="" | ||
19 | - local image_size=$* | ||
20 | local optstr="" | ||
21 | local img_name="" | ||
22 | local use_backing=0 | ||
23 | local backing_file="" | ||
24 | local object_options="" | ||
25 | + local misc_params=() | ||
26 | |||
27 | if [ -n "$TEST_IMG_FILE" ]; then | ||
28 | img_name=$TEST_IMG_FILE | ||
29 | @@ -XXX,XX +XXX,XX @@ _make_test_img() | ||
30 | optstr=$(_optstr_add "$optstr" "key-secret=keysec0") | ||
31 | fi | ||
32 | |||
33 | - if [ "$1" = "-b" ]; then | ||
34 | - use_backing=1 | ||
35 | - backing_file=$2 | ||
36 | - image_size=$3 | ||
37 | - fi | ||
38 | + for param; do | ||
39 | + if [ "$use_backing" = "1" -a -z "$backing_file" ]; then | ||
40 | + backing_file=$param | ||
41 | + continue | ||
42 | + fi | ||
43 | + | ||
44 | + case "$param" in | ||
45 | + -b) | ||
46 | + use_backing=1 | ||
47 | + ;; | ||
48 | + | ||
49 | + *) | ||
50 | + misc_params=("${misc_params[@]}" "$param") | ||
51 | + ;; | ||
52 | + esac | ||
53 | + done | ||
54 | + | ||
55 | if [ \( "$IMGFMT" = "qcow2" -o "$IMGFMT" = "qed" \) -a -n "$CLUSTER_SIZE" ]; then | ||
56 | optstr=$(_optstr_add "$optstr" "cluster_size=$CLUSTER_SIZE") | ||
57 | fi | ||
58 | @@ -XXX,XX +XXX,XX @@ _make_test_img() | ||
59 | # XXX(hch): have global image options? | ||
60 | ( | ||
61 | if [ $use_backing = 1 ]; then | ||
62 | - $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options -b "$backing_file" "$img_name" $image_size 2>&1 | ||
63 | + $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options -b "$backing_file" "$img_name" "${misc_params[@]}" 2>&1 | ||
64 | else | ||
65 | - $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options "$img_name" $image_size 2>&1 | ||
66 | + $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options "$img_name" "${misc_params[@]}" 2>&1 | ||
67 | fi | ||
68 | ) | _filter_img_create | ||
69 | |||
70 | -- | ||
71 | 2.24.1 | ||
72 | |||
73 | diff view generated by jsdifflib |
New patch | |||
---|---|---|---|
1 | Blindly overriding IMGOPTS is suboptimal as this discards user-specified | ||
2 | options. Whatever options the test needs should simply be appended. | ||
1 | 3 | ||
4 | Some tests do this (with IMGOPTS=$(_optstr_add "$IMGOPTS" "...")), but | ||
5 | that is cumbersome. It’s simpler to just give _make_test_img an -o | ||
6 | parameter with which tests can add options. | ||
7 | |||
8 | Some tests actually must override the user-specified options, though, | ||
9 | for example when creating an image in a different format than the test | ||
10 | $IMGFMT. For such cases, --no-opts allows clearing the current option | ||
11 | list. | ||
12 | |||
13 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
14 | Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> | ||
15 | Message-id: 20191107163708.833192-10-mreitz@redhat.com | ||
16 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
17 | --- | ||
18 | tests/qemu-iotests/common.rc | 13 +++++++++++++ | ||
19 | 1 file changed, 13 insertions(+) | ||
20 | |||
21 | diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc | ||
22 | index XXXXXXX..XXXXXXX 100644 | ||
23 | --- a/tests/qemu-iotests/common.rc | ||
24 | +++ b/tests/qemu-iotests/common.rc | ||
25 | @@ -XXX,XX +XXX,XX @@ _make_test_img() | ||
26 | local use_backing=0 | ||
27 | local backing_file="" | ||
28 | local object_options="" | ||
29 | + local opts_param=false | ||
30 | local misc_params=() | ||
31 | |||
32 | if [ -n "$TEST_IMG_FILE" ]; then | ||
33 | @@ -XXX,XX +XXX,XX @@ _make_test_img() | ||
34 | if [ "$use_backing" = "1" -a -z "$backing_file" ]; then | ||
35 | backing_file=$param | ||
36 | continue | ||
37 | + elif $opts_param; then | ||
38 | + optstr=$(_optstr_add "$optstr" "$param") | ||
39 | + opts_param=false | ||
40 | + continue | ||
41 | fi | ||
42 | |||
43 | case "$param" in | ||
44 | @@ -XXX,XX +XXX,XX @@ _make_test_img() | ||
45 | use_backing=1 | ||
46 | ;; | ||
47 | |||
48 | + -o) | ||
49 | + opts_param=true | ||
50 | + ;; | ||
51 | + | ||
52 | + --no-opts) | ||
53 | + optstr="" | ||
54 | + ;; | ||
55 | + | ||
56 | *) | ||
57 | misc_params=("${misc_params[@]}" "$param") | ||
58 | ;; | ||
59 | -- | ||
60 | 2.24.1 | ||
61 | |||
62 | diff view generated by jsdifflib |
1 | From: Stefan Hajnoczi <stefanha@redhat.com> | 1 | It did not matter before, but now that _make_test_img understands -o, we |
---|---|---|---|
2 | should use it properly here. | ||
2 | 3 | ||
3 | Fixes: a6b257a08e3d72219f03e461a52152672fec0612 | 4 | Signed-off-by: Max Reitz <mreitz@redhat.com> |
4 | ("file-posix: Handle undetectable alignment") | 5 | Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> |
5 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> | 6 | Message-id: 20191107163708.833192-11-mreitz@redhat.com |
6 | Message-id: 20190827101328.4062-1-stefanha@redhat.com | ||
7 | Reviewed-by: Thomas Huth <thuth@redhat.com> | ||
8 | Signed-off-by: Max Reitz <mreitz@redhat.com> | 7 | Signed-off-by: Max Reitz <mreitz@redhat.com> |
9 | --- | 8 | --- |
10 | block/file-posix.c | 2 +- | 9 | tests/qemu-iotests/051 | 2 +- |
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
12 | 11 | ||
13 | diff --git a/block/file-posix.c b/block/file-posix.c | 12 | diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 |
14 | index XXXXXXX..XXXXXXX 100644 | 13 | index XXXXXXX..XXXXXXX 100755 |
15 | --- a/block/file-posix.c | 14 | --- a/tests/qemu-iotests/051 |
16 | +++ b/block/file-posix.c | 15 | +++ b/tests/qemu-iotests/051 |
17 | @@ -XXX,XX +XXX,XX @@ static void raw_probe_alignment(BlockDriverState *bs, int fd, Error **errp) | 16 | @@ -XXX,XX +XXX,XX @@ echo |
18 | for (i = 0; i < ARRAY_SIZE(alignments); i++) { | 17 | echo === With version 2 images enabling lazy refcounts must fail === |
19 | align = alignments[i]; | 18 | echo |
20 | if (raw_is_io_aligned(fd, buf + align, max_align)) { | 19 | |
21 | - /* Fallback to request_aligment. */ | 20 | -_make_test_img -ocompat=0.10 $size |
22 | + /* Fallback to request_alignment. */ | 21 | +_make_test_img -o compat=0.10 $size |
23 | s->buf_align = (align != 1) ? align : bs->bl.request_alignment; | 22 | |
24 | break; | 23 | run_qemu -drive file="$TEST_IMG",format=qcow2,lazy-refcounts=on |
25 | } | 24 | run_qemu -drive file="$TEST_IMG",format=qcow2,lazy-refcounts=off |
26 | -- | 25 | -- |
27 | 2.21.0 | 26 | 2.24.1 |
28 | 27 | ||
29 | 28 | diff view generated by jsdifflib |
1 | From: Nir Soffer <nirsof@gmail.com> | 1 | Tests should not overwrite all user-supplied image options, but only add |
---|---|---|---|
2 | to it (which will effectively overwrite conflicting values). Accomplish | ||
3 | this by passing options to _make_test_img via -o instead of $IMGOPTS. | ||
2 | 4 | ||
3 | Quoting cache mode is not needed, and most tests use unquoted values. | 5 | For some tests, there is no functional change because they already only |
4 | Unify all test to use the same style. | 6 | appended options to IMGOPTS. For these, this patch is just a |
7 | simplification. | ||
5 | 8 | ||
6 | Message-id: 20190827173432.7656-1-nsoffer@redhat.com | 9 | For others, this is a change, so they now heed user-specified $IMGOPTS. |
7 | Signed-off-by: Nir Soffer <nsoffer@redhat.com> | 10 | Some of those tests do not work with all image options, though, so we |
11 | need to disable them accordingly. | ||
12 | |||
13 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
14 | Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> | ||
15 | Message-id: 20191107163708.833192-12-mreitz@redhat.com | ||
8 | Signed-off-by: Max Reitz <mreitz@redhat.com> | 16 | Signed-off-by: Max Reitz <mreitz@redhat.com> |
9 | --- | 17 | --- |
10 | tests/qemu-iotests/026 | 4 ++-- | 18 | tests/qemu-iotests/031 | 9 ++++--- |
11 | tests/qemu-iotests/039 | 4 ++-- | 19 | tests/qemu-iotests/039 | 24 ++++++------------ |
12 | tests/qemu-iotests/052 | 2 +- | 20 | tests/qemu-iotests/059 | 18 ++++++------- |
13 | tests/qemu-iotests/091 | 4 ++-- | 21 | tests/qemu-iotests/060 | 6 ++--- |
14 | 4 files changed, 7 insertions(+), 7 deletions(-) | 22 | tests/qemu-iotests/061 | 57 ++++++++++++++++++++++-------------------- |
23 | tests/qemu-iotests/079 | 3 +-- | ||
24 | tests/qemu-iotests/106 | 2 +- | ||
25 | tests/qemu-iotests/108 | 2 +- | ||
26 | tests/qemu-iotests/112 | 32 ++++++++++++------------ | ||
27 | tests/qemu-iotests/115 | 3 +-- | ||
28 | tests/qemu-iotests/121 | 6 ++--- | ||
29 | tests/qemu-iotests/125 | 2 +- | ||
30 | tests/qemu-iotests/137 | 2 +- | ||
31 | tests/qemu-iotests/138 | 3 +-- | ||
32 | tests/qemu-iotests/175 | 2 +- | ||
33 | tests/qemu-iotests/190 | 2 +- | ||
34 | tests/qemu-iotests/191 | 3 +-- | ||
35 | tests/qemu-iotests/220 | 4 ++- | ||
36 | tests/qemu-iotests/243 | 6 +++-- | ||
37 | tests/qemu-iotests/244 | 10 +++++--- | ||
38 | tests/qemu-iotests/250 | 3 +-- | ||
39 | tests/qemu-iotests/265 | 2 +- | ||
40 | 22 files changed, 100 insertions(+), 101 deletions(-) | ||
15 | 41 | ||
16 | diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026 | 42 | diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031 |
17 | index XXXXXXX..XXXXXXX 100755 | 43 | index XXXXXXX..XXXXXXX 100755 |
18 | --- a/tests/qemu-iotests/026 | 44 | --- a/tests/qemu-iotests/031 |
19 | +++ b/tests/qemu-iotests/026 | 45 | +++ b/tests/qemu-iotests/031 |
20 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | 46 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 |
21 | # Currently only qcow2 supports rebasing | 47 | # This tests qcow2-specific low-level functionality |
22 | _supported_fmt qcow2 | 48 | _supported_fmt qcow2 |
23 | _supported_proto file | 49 | _supported_proto file |
24 | -_default_cache_mode "writethrough" | 50 | +# We want to test compat=0.10, which does not support refcount widths |
25 | -_supported_cache_modes "writethrough" "none" | 51 | +# other than 16 |
26 | +_default_cache_mode writethrough | 52 | +_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' |
27 | +_supported_cache_modes writethrough none | 53 | |
28 | # The refcount table tests expect a certain minimum width for refcount entries | 54 | CLUSTER_SIZE=65536 |
29 | # (so that the refcount table actually needs to grow); that minimum is 16 bits, | 55 | |
30 | # being the default refcount entry width. | 56 | # qcow2.py output depends on the exact options used, so override the command |
57 | # line here as an exception | ||
58 | -for IMGOPTS in "compat=0.10" "compat=1.1"; do | ||
59 | +for compat in "compat=0.10" "compat=1.1"; do | ||
60 | |||
61 | echo | ||
62 | - echo ===== Testing with -o $IMGOPTS ===== | ||
63 | + echo ===== Testing with -o $compat ===== | ||
64 | echo | ||
65 | echo === Create image with unknown header extension === | ||
66 | echo | ||
67 | - _make_test_img 64M | ||
68 | + _make_test_img -o $compat 64M | ||
69 | $PYTHON qcow2.py "$TEST_IMG" add-header-ext 0x12345678 "This is a test header extension" | ||
70 | $PYTHON qcow2.py "$TEST_IMG" dump-header | ||
71 | _check_test_img | ||
31 | diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039 | 72 | diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039 |
32 | index XXXXXXX..XXXXXXX 100755 | 73 | index XXXXXXX..XXXXXXX 100755 |
33 | --- a/tests/qemu-iotests/039 | 74 | --- a/tests/qemu-iotests/039 |
34 | +++ b/tests/qemu-iotests/039 | 75 | +++ b/tests/qemu-iotests/039 |
76 | @@ -XXX,XX +XXX,XX @@ size=128M | ||
77 | echo | ||
78 | echo "== Checking that image is clean on shutdown ==" | ||
79 | |||
80 | -IMGOPTS="compat=1.1,lazy_refcounts=on" | ||
81 | -_make_test_img $size | ||
82 | +_make_test_img -o "compat=1.1,lazy_refcounts=on" $size | ||
83 | |||
84 | $QEMU_IO -c "write -P 0x5a 0 512" "$TEST_IMG" | _filter_qemu_io | ||
85 | |||
86 | @@ -XXX,XX +XXX,XX @@ _check_test_img | ||
87 | echo | ||
88 | echo "== Creating a dirty image file ==" | ||
89 | |||
90 | -IMGOPTS="compat=1.1,lazy_refcounts=on" | ||
91 | -_make_test_img $size | ||
92 | +_make_test_img -o "compat=1.1,lazy_refcounts=on" $size | ||
93 | |||
94 | _NO_VALGRIND \ | ||
95 | $QEMU_IO -c "write -P 0x5a 0 512" \ | ||
96 | @@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0x5a 0 512" "$TEST_IMG" | _filter_qemu_io | ||
97 | echo | ||
98 | echo "== Opening a dirty image read/write should repair it ==" | ||
99 | |||
100 | -IMGOPTS="compat=1.1,lazy_refcounts=on" | ||
101 | -_make_test_img $size | ||
102 | +_make_test_img -o "compat=1.1,lazy_refcounts=on" $size | ||
103 | |||
104 | _NO_VALGRIND \ | ||
105 | $QEMU_IO -c "write -P 0x5a 0 512" \ | ||
106 | @@ -XXX,XX +XXX,XX @@ $PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features | ||
107 | echo | ||
108 | echo "== Creating an image file with lazy_refcounts=off ==" | ||
109 | |||
110 | -IMGOPTS="compat=1.1,lazy_refcounts=off" | ||
111 | -_make_test_img $size | ||
112 | +_make_test_img -o "compat=1.1,lazy_refcounts=off" $size | ||
113 | |||
114 | _NO_VALGRIND \ | ||
115 | $QEMU_IO -c "write -P 0x5a 0 512" \ | ||
116 | @@ -XXX,XX +XXX,XX @@ _check_test_img | ||
117 | echo | ||
118 | echo "== Committing to a backing file with lazy_refcounts=on ==" | ||
119 | |||
120 | -IMGOPTS="compat=1.1,lazy_refcounts=on" | ||
121 | -TEST_IMG="$TEST_IMG".base _make_test_img $size | ||
122 | +TEST_IMG="$TEST_IMG".base _make_test_img -o "compat=1.1,lazy_refcounts=on" $size | ||
123 | |||
124 | -IMGOPTS="compat=1.1,lazy_refcounts=on,backing_file=$TEST_IMG.base" | ||
125 | -_make_test_img $size | ||
126 | +_make_test_img -o "compat=1.1,lazy_refcounts=on,backing_file=$TEST_IMG.base" $size | ||
127 | |||
128 | $QEMU_IO -c "write 0 512" "$TEST_IMG" | _filter_qemu_io | ||
129 | $QEMU_IMG commit "$TEST_IMG" | ||
130 | @@ -XXX,XX +XXX,XX @@ TEST_IMG="$TEST_IMG".base _check_test_img | ||
131 | echo | ||
132 | echo "== Changing lazy_refcounts setting at runtime ==" | ||
133 | |||
134 | -IMGOPTS="compat=1.1,lazy_refcounts=off" | ||
135 | -_make_test_img $size | ||
136 | +_make_test_img -o "compat=1.1,lazy_refcounts=off" $size | ||
137 | |||
138 | _NO_VALGRIND \ | ||
139 | $QEMU_IO -c "reopen -o lazy-refcounts=on" \ | ||
140 | @@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "reopen -o lazy-refcounts=on" \ | ||
141 | $PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features | ||
142 | _check_test_img | ||
143 | |||
144 | -IMGOPTS="compat=1.1,lazy_refcounts=on" | ||
145 | -_make_test_img $size | ||
146 | +_make_test_img -o "compat=1.1,lazy_refcounts=on" $size | ||
147 | |||
148 | _NO_VALGRIND \ | ||
149 | $QEMU_IO -c "reopen -o lazy-refcounts=off" \ | ||
150 | diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059 | ||
151 | index XXXXXXX..XXXXXXX 100755 | ||
152 | --- a/tests/qemu-iotests/059 | ||
153 | +++ b/tests/qemu-iotests/059 | ||
154 | @@ -XXX,XX +XXX,XX @@ poke_file "$TEST_IMG" "$grain_table_size_offset" "\x01\x00\x00\x00" | ||
155 | |||
156 | echo | ||
157 | echo "=== Testing monolithicFlat creation and opening ===" | ||
158 | -IMGOPTS="subformat=monolithicFlat" _make_test_img 2G | ||
159 | +_make_test_img -o "subformat=monolithicFlat" 2G | ||
160 | _img_info | ||
161 | _cleanup_test_img | ||
162 | |||
163 | echo | ||
164 | echo "=== Testing monolithicFlat with zeroed_grain ===" | ||
165 | -IMGOPTS="subformat=monolithicFlat,zeroed_grain=on" _make_test_img 2G | ||
166 | +_make_test_img -o "subformat=monolithicFlat,zeroed_grain=on" 2G | ||
167 | _cleanup_test_img | ||
168 | |||
169 | echo | ||
170 | echo "=== Testing big twoGbMaxExtentFlat ===" | ||
171 | -IMGOPTS="subformat=twoGbMaxExtentFlat" _make_test_img 1000G | ||
172 | +_make_test_img -o "subformat=twoGbMaxExtentFlat" 1000G | ||
173 | $QEMU_IMG info $TEST_IMG | _filter_testdir | sed -e 's/cid: [0-9]*/cid: XXXXXXXX/' | ||
174 | _cleanup_test_img | ||
175 | |||
176 | @@ -XXX,XX +XXX,XX @@ _img_info | ||
177 | |||
178 | echo | ||
179 | echo "=== Testing truncated sparse ===" | ||
180 | -IMGOPTS="subformat=monolithicSparse" _make_test_img 100G | ||
181 | +_make_test_img -o "subformat=monolithicSparse" 100G | ||
182 | truncate -s 10M $TEST_IMG | ||
183 | _img_info | ||
184 | |||
185 | echo | ||
186 | echo "=== Converting to streamOptimized from image with small cluster size===" | ||
187 | -TEST_IMG="$TEST_IMG.qcow2" IMGFMT=qcow2 IMGOPTS="cluster_size=4096" _make_test_img 1G | ||
188 | +TEST_IMG="$TEST_IMG.qcow2" IMGFMT=qcow2 _make_test_img -o "cluster_size=4096" 1G | ||
189 | $QEMU_IO -f qcow2 -c "write -P 0xa 0 512" "$TEST_IMG.qcow2" | _filter_qemu_io | ||
190 | $QEMU_IO -f qcow2 -c "write -P 0xb 10240 512" "$TEST_IMG.qcow2" | _filter_qemu_io | ||
191 | $QEMU_IMG convert -f qcow2 -O vmdk -o subformat=streamOptimized "$TEST_IMG.qcow2" "$TEST_IMG" 2>&1 | ||
192 | @@ -XXX,XX +XXX,XX @@ echo "=== Testing monolithicFlat with internally generated JSON file name ===" | ||
193 | |||
194 | echo '--- blkdebug ---' | ||
195 | # Should work, because bdrv_dirname() works fine with blkdebug | ||
196 | -IMGOPTS="subformat=monolithicFlat" _make_test_img 64M | ||
197 | +_make_test_img -o "subformat=monolithicFlat" 64M | ||
198 | $QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.image.filename=$TEST_IMG,file.inject-error.0.event=read_aio" \ | ||
199 | -c info \ | ||
200 | 2>&1 \ | ||
201 | @@ -XXX,XX +XXX,XX @@ _cleanup_test_img | ||
202 | |||
203 | echo '--- quorum ---' | ||
204 | # Should not work, because bdrv_dirname() does not work with quorum | ||
205 | -IMGOPTS="subformat=monolithicFlat" _make_test_img 64M | ||
206 | +_make_test_img -o "subformat=monolithicFlat" 64M | ||
207 | cp "$TEST_IMG" "$TEST_IMG.orig" | ||
208 | |||
209 | filename="json:{ | ||
210 | @@ -XXX,XX +XXX,XX @@ _cleanup_test_img | ||
211 | |||
212 | echo | ||
213 | echo "=== Testing 4TB monolithicFlat creation and IO ===" | ||
214 | -IMGOPTS="subformat=monolithicFlat" _make_test_img 4T | ||
215 | +_make_test_img -o "subformat=monolithicFlat" 4T | ||
216 | _img_info | ||
217 | $QEMU_IO -c "write -P 0xa 900G 512" "$TEST_IMG" | _filter_qemu_io | ||
218 | $QEMU_IO -c "read -v 900G 1024" "$TEST_IMG" | _filter_qemu_io | ||
219 | @@ -XXX,XX +XXX,XX @@ _cleanup_test_img | ||
220 | echo | ||
221 | echo "=== Testing qemu-img map on extents ===" | ||
222 | for fmt in monolithicSparse twoGbMaxExtentSparse; do | ||
223 | - IMGOPTS="subformat=$fmt" _make_test_img 31G | ||
224 | + _make_test_img -o "subformat=$fmt" 31G | ||
225 | $QEMU_IO -c "write 65024 1k" "$TEST_IMG" | _filter_qemu_io | ||
226 | $QEMU_IO -c "write 2147483136 1k" "$TEST_IMG" | _filter_qemu_io | ||
227 | $QEMU_IO -c "write 5G 1k" "$TEST_IMG" | _filter_qemu_io | ||
228 | diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060 | ||
229 | index XXXXXXX..XXXXXXX 100755 | ||
230 | --- a/tests/qemu-iotests/060 | ||
231 | +++ b/tests/qemu-iotests/060 | ||
232 | @@ -XXX,XX +XXX,XX @@ $QEMU_IO -c 'write 0k 64k' "$BACKING_IMG" | _filter_qemu_io | ||
233 | # compat=0.10 is required in order to make the following discard actually | ||
234 | # unallocate the sector rather than make it a zero sector - we want COW, after | ||
235 | # all. | ||
236 | -IMGOPTS='compat=0.10' _make_test_img -b "$BACKING_IMG" 1G | ||
237 | +_make_test_img -o 'compat=0.10' -b "$BACKING_IMG" 1G | ||
238 | # Write two clusters, the second one enforces creation of an L2 table after | ||
239 | # the first data cluster. | ||
240 | $QEMU_IO -c 'write 0k 64k' -c 'write 512M 64k' "$TEST_IMG" | _filter_qemu_io | ||
241 | @@ -XXX,XX +XXX,XX @@ echo | ||
242 | echo "=== Discarding a non-covered in-bounds refblock ===" | ||
243 | echo | ||
244 | |||
245 | -IMGOPTS='refcount_bits=1' _make_test_img 64M | ||
246 | +_make_test_img -o 'refcount_bits=1' 64M | ||
247 | |||
248 | # Pretend there's a refblock somewhere where there is no refblock to | ||
249 | # cover it (but the covering refblock has a valid index in the | ||
250 | @@ -XXX,XX +XXX,XX @@ echo | ||
251 | echo "=== Discarding a refblock covered by an unaligned refblock ===" | ||
252 | echo | ||
253 | |||
254 | -IMGOPTS='refcount_bits=1' _make_test_img 64M | ||
255 | +_make_test_img -o 'refcount_bits=1' 64M | ||
256 | |||
257 | # Same as above | ||
258 | poke_file "$TEST_IMG" "$(($rt_offset+8))" "\x00\x00\x00\x10\x00\x00\x00\x00" | ||
259 | diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061 | ||
260 | index XXXXXXX..XXXXXXX 100755 | ||
261 | --- a/tests/qemu-iotests/061 | ||
262 | +++ b/tests/qemu-iotests/061 | ||
35 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | 263 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 |
36 | _supported_fmt qcow2 | 264 | _supported_fmt qcow2 |
37 | _supported_proto file | 265 | _supported_proto file |
38 | _supported_os Linux | 266 | _supported_os Linux |
39 | -_default_cache_mode "writethrough" | 267 | +# Conversion between different compat versions can only really work |
40 | -_supported_cache_modes "writethrough" | 268 | +# with refcount_bits=16 |
41 | +_default_cache_mode writethrough | 269 | +_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' |
42 | +_supported_cache_modes writethrough | 270 | |
43 | 271 | echo | |
44 | size=128M | 272 | echo "=== Testing version downgrade with zero expansion ===" |
45 | 273 | echo | |
46 | diff --git a/tests/qemu-iotests/052 b/tests/qemu-iotests/052 | 274 | -IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M |
47 | index XXXXXXX..XXXXXXX 100755 | 275 | +_make_test_img -o "compat=1.1,lazy_refcounts=on" 64M |
48 | --- a/tests/qemu-iotests/052 | 276 | $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io |
49 | +++ b/tests/qemu-iotests/052 | 277 | $PYTHON qcow2.py "$TEST_IMG" dump-header |
50 | @@ -XXX,XX +XXX,XX @@ _supported_fmt generic | 278 | $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG" |
51 | _supported_proto file | 279 | @@ -XXX,XX +XXX,XX @@ _check_test_img |
52 | 280 | echo | |
53 | # Don't do O_DIRECT on tmpfs | 281 | echo "=== Testing version downgrade with zero expansion and 4K cache entries ===" |
54 | -_supported_cache_modes "writeback" "writethrough" "unsafe" | 282 | echo |
55 | +_supported_cache_modes writeback writethrough unsafe | 283 | -IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M |
56 | 284 | +_make_test_img -o "compat=1.1,lazy_refcounts=on" 64M | |
57 | size=128M | 285 | $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io |
58 | _make_test_img $size | 286 | $QEMU_IO -c "write -z 32M 128k" "$TEST_IMG" | _filter_qemu_io |
59 | diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091 | 287 | $QEMU_IO -c map "$TEST_IMG" | _filter_qemu_io |
60 | index XXXXXXX..XXXXXXX 100755 | 288 | @@ -XXX,XX +XXX,XX @@ _check_test_img |
61 | --- a/tests/qemu-iotests/091 | 289 | echo |
62 | +++ b/tests/qemu-iotests/091 | 290 | echo "=== Testing dirty version downgrade ===" |
291 | echo | ||
292 | -IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M | ||
293 | +_make_test_img -o "compat=1.1,lazy_refcounts=on" 64M | ||
294 | _NO_VALGRIND \ | ||
295 | $QEMU_IO -c "write -P 0x2a 0 128k" -c flush \ | ||
296 | -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 | _filter_qemu_io | ||
297 | @@ -XXX,XX +XXX,XX @@ _check_test_img | ||
298 | echo | ||
299 | echo "=== Testing version downgrade with unknown compat/autoclear flags ===" | ||
300 | echo | ||
301 | -IMGOPTS="compat=1.1" _make_test_img 64M | ||
302 | +_make_test_img -o "compat=1.1" 64M | ||
303 | $PYTHON qcow2.py "$TEST_IMG" set-feature-bit compatible 42 | ||
304 | $PYTHON qcow2.py "$TEST_IMG" set-feature-bit autoclear 42 | ||
305 | $PYTHON qcow2.py "$TEST_IMG" dump-header | ||
306 | @@ -XXX,XX +XXX,XX @@ _check_test_img | ||
307 | echo | ||
308 | echo "=== Testing version upgrade and resize ===" | ||
309 | echo | ||
310 | -IMGOPTS="compat=0.10" _make_test_img 64M | ||
311 | +_make_test_img -o "compat=0.10" 64M | ||
312 | $QEMU_IO -c "write -P 0x2a 42M 64k" "$TEST_IMG" | _filter_qemu_io | ||
313 | $PYTHON qcow2.py "$TEST_IMG" dump-header | ||
314 | $QEMU_IMG amend -o "compat=1.1,lazy_refcounts=on,size=128M" "$TEST_IMG" | ||
315 | @@ -XXX,XX +XXX,XX @@ _check_test_img | ||
316 | echo | ||
317 | echo "=== Testing dirty lazy_refcounts=off ===" | ||
318 | echo | ||
319 | -IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M | ||
320 | +_make_test_img -o "compat=1.1,lazy_refcounts=on" 64M | ||
321 | _NO_VALGRIND \ | ||
322 | $QEMU_IO -c "write -P 0x2a 0 128k" -c flush \ | ||
323 | -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 | _filter_qemu_io | ||
324 | @@ -XXX,XX +XXX,XX @@ _check_test_img | ||
325 | echo | ||
326 | echo "=== Testing backing file ===" | ||
327 | echo | ||
328 | -IMGOPTS="compat=1.1" _make_test_img 64M | ||
329 | -IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 64M | ||
330 | +_make_test_img -o "compat=1.1" 64M | ||
331 | +TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 64M | ||
332 | $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG.base" | _filter_qemu_io | ||
333 | $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io | ||
334 | $QEMU_IMG amend -o "backing_file=$TEST_IMG.base,backing_fmt=qcow2" "$TEST_IMG" | ||
335 | @@ -XXX,XX +XXX,XX @@ _check_test_img | ||
336 | echo | ||
337 | echo "=== Testing invalid configurations ===" | ||
338 | echo | ||
339 | -IMGOPTS="compat=0.10" _make_test_img 64M | ||
340 | +_make_test_img -o "compat=0.10" 64M | ||
341 | $QEMU_IMG amend -o "lazy_refcounts=on" "$TEST_IMG" | ||
342 | $QEMU_IMG amend -o "compat=1.1" "$TEST_IMG" # actually valid | ||
343 | $QEMU_IMG amend -o "compat=0.10,lazy_refcounts=on" "$TEST_IMG" | ||
344 | @@ -XXX,XX +XXX,XX @@ $QEMU_IMG amend -o "preallocation=on" "$TEST_IMG" | ||
345 | echo | ||
346 | echo "=== Testing correct handling of unset value ===" | ||
347 | echo | ||
348 | -IMGOPTS="compat=1.1,cluster_size=1k" _make_test_img 64M | ||
349 | +_make_test_img -o "compat=1.1,cluster_size=1k" 64M | ||
350 | echo "Should work:" | ||
351 | $QEMU_IMG amend -o "lazy_refcounts=on" "$TEST_IMG" | ||
352 | echo "Should not work:" # Just to know which of these tests actually fails | ||
353 | @@ -XXX,XX +XXX,XX @@ $QEMU_IMG amend -o "cluster_size=64k" "$TEST_IMG" | ||
354 | echo | ||
355 | echo "=== Testing zero expansion on inactive clusters ===" | ||
356 | echo | ||
357 | -IMGOPTS="compat=1.1" _make_test_img 64M | ||
358 | +_make_test_img -o "compat=1.1" 64M | ||
359 | $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io | ||
360 | $QEMU_IMG snapshot -c foo "$TEST_IMG" | ||
361 | $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG" | _filter_qemu_io | ||
362 | @@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io | ||
363 | echo | ||
364 | echo "=== Testing zero expansion on shared L2 table ===" | ||
365 | echo | ||
366 | -IMGOPTS="compat=1.1" _make_test_img 64M | ||
367 | +_make_test_img -o "compat=1.1" 64M | ||
368 | $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io | ||
369 | $QEMU_IMG snapshot -c foo "$TEST_IMG" | ||
370 | $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG" | ||
371 | @@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io | ||
372 | echo | ||
373 | echo "=== Testing zero expansion on backed image ===" | ||
374 | echo | ||
375 | -IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 64M | ||
376 | +TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 64M | ||
377 | $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG.base" | _filter_qemu_io | ||
378 | -IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 64M | ||
379 | +_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 64M | ||
380 | $QEMU_IO -c "read -P 0x2a 0 128k" -c "write -z 0 64k" "$TEST_IMG" | _filter_qemu_io | ||
381 | $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG" | ||
382 | _check_test_img | ||
383 | @@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 64k" -c "read -P 0x2a 64k 64k" "$TEST_IMG" | _filter_qe | ||
384 | echo | ||
385 | echo "=== Testing zero expansion on backed inactive clusters ===" | ||
386 | echo | ||
387 | -IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 64M | ||
388 | +TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 64M | ||
389 | $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG.base" | _filter_qemu_io | ||
390 | -IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 64M | ||
391 | +_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 64M | ||
392 | $QEMU_IO -c "write -z 0 64k" "$TEST_IMG" | _filter_qemu_io | ||
393 | $QEMU_IMG snapshot -c foo "$TEST_IMG" | ||
394 | $QEMU_IO -c "write -P 0x42 0 128k" "$TEST_IMG" | _filter_qemu_io | ||
395 | @@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 64k" -c "read -P 0x2a 64k 64k" "$TEST_IMG" | _filter_qe | ||
396 | echo | ||
397 | echo "=== Testing zero expansion on backed image with shared L2 table ===" | ||
398 | echo | ||
399 | -IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 64M | ||
400 | +TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 64M | ||
401 | $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG.base" | _filter_qemu_io | ||
402 | -IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 64M | ||
403 | +_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 64M | ||
404 | $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io | ||
405 | $QEMU_IMG snapshot -c foo "$TEST_IMG" | ||
406 | $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG" | ||
407 | @@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io | ||
408 | echo | ||
409 | echo "=== Testing preallocated zero expansion on full image ===" | ||
410 | echo | ||
411 | -IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG" _make_test_img 64M | ||
412 | +TEST_IMG="$TEST_IMG" _make_test_img -o "compat=1.1" 64M | ||
413 | $QEMU_IO -c "write -P 0x2a 0 64M" "$TEST_IMG" -c "write -z 0 64M" | _filter_qemu_io | ||
414 | $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG" | ||
415 | _check_test_img | ||
416 | @@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "read -P 0 0 64M" "$TEST_IMG" | _filter_qemu_io | ||
417 | echo | ||
418 | echo "=== Testing progress report without snapshot ===" | ||
419 | echo | ||
420 | -IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 4G | ||
421 | -IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 4G | ||
422 | +TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 4G | ||
423 | +_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 4G | ||
424 | $QEMU_IO -c "write -z 0 64k" \ | ||
425 | -c "write -z 1G 64k" \ | ||
426 | -c "write -z 2G 64k" \ | ||
427 | @@ -XXX,XX +XXX,XX @@ _check_test_img | ||
428 | echo | ||
429 | echo "=== Testing progress report with snapshot ===" | ||
430 | echo | ||
431 | -IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 4G | ||
432 | -IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 4G | ||
433 | +TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 4G | ||
434 | +_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 4G | ||
435 | $QEMU_IO -c "write -z 0 64k" \ | ||
436 | -c "write -z 1G 64k" \ | ||
437 | -c "write -z 2G 64k" \ | ||
438 | @@ -XXX,XX +XXX,XX @@ _check_test_img | ||
439 | echo | ||
440 | echo "=== Testing version downgrade with external data file ===" | ||
441 | echo | ||
442 | -IMGOPTS="compat=1.1,data_file=$TEST_IMG.data" _make_test_img 64M | ||
443 | +_make_test_img -o "compat=1.1,data_file=$TEST_IMG.data" 64M | ||
444 | $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG" | ||
445 | _img_info --format-specific | ||
446 | _check_test_img | ||
447 | @@ -XXX,XX +XXX,XX @@ _check_test_img | ||
448 | echo | ||
449 | echo "=== Try changing the external data file ===" | ||
450 | echo | ||
451 | -IMGOPTS="compat=1.1" _make_test_img 64M | ||
452 | +_make_test_img -o "compat=1.1" 64M | ||
453 | $QEMU_IMG amend -o "data_file=foo" "$TEST_IMG" | ||
454 | |||
455 | echo | ||
456 | -IMGOPTS="compat=1.1,data_file=$TEST_IMG.data" _make_test_img 64M | ||
457 | +_make_test_img -o "compat=1.1,data_file=$TEST_IMG.data" 64M | ||
458 | $QEMU_IMG amend -o "data_file=foo" "$TEST_IMG" | ||
459 | _img_info --format-specific | ||
460 | TEST_IMG="data-file.filename=$TEST_IMG.data,file.filename=$TEST_IMG" _img_info --format-specific --image-opts | ||
461 | @@ -XXX,XX +XXX,XX @@ TEST_IMG="data-file.filename=$TEST_IMG.data,file.filename=$TEST_IMG" _img_info - | ||
462 | echo | ||
463 | echo "=== Clearing and setting data-file-raw ===" | ||
464 | echo | ||
465 | -IMGOPTS="compat=1.1,data_file=$TEST_IMG.data,data_file_raw=on" _make_test_img 64M | ||
466 | +_make_test_img -o "compat=1.1,data_file=$TEST_IMG.data,data_file_raw=on" 64M | ||
467 | $QEMU_IMG amend -o "data_file_raw=on" "$TEST_IMG" | ||
468 | _img_info --format-specific | ||
469 | _check_test_img | ||
470 | diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079 | ||
471 | index XXXXXXX..XXXXXXX 100755 | ||
472 | --- a/tests/qemu-iotests/079 | ||
473 | +++ b/tests/qemu-iotests/079 | ||
474 | @@ -XXX,XX +XXX,XX @@ echo | ||
475 | cluster_sizes="16384 32768 65536 131072 262144 524288 1048576 2097152 4194304" | ||
476 | |||
477 | for s in $cluster_sizes; do | ||
478 | - IMGOPTS=$(_optstr_add "$IMGOPTS" "preallocation=metadata,cluster_size=$s") \ | ||
479 | - _make_test_img 4G | ||
480 | + _make_test_img -o "preallocation=metadata,cluster_size=$s" 4G | ||
481 | done | ||
482 | |||
483 | # success, all done | ||
484 | diff --git a/tests/qemu-iotests/106 b/tests/qemu-iotests/106 | ||
485 | index XXXXXXX..XXXXXXX 100755 | ||
486 | --- a/tests/qemu-iotests/106 | ||
487 | +++ b/tests/qemu-iotests/106 | ||
488 | @@ -XXX,XX +XXX,XX @@ for create_mode in off falloc full; do | ||
489 | echo | ||
490 | echo "--- create_mode=$create_mode growth_mode=$growth_mode ---" | ||
491 | |||
492 | - IMGOPTS="preallocation=$create_mode" _make_test_img ${CREATION_SIZE}K | ||
493 | + _make_test_img -o "preallocation=$create_mode" ${CREATION_SIZE}K | ||
494 | $QEMU_IMG resize -f "$IMGFMT" --preallocation=$growth_mode "$TEST_IMG" +${GROWTH_SIZE}K | ||
495 | |||
496 | expected_size=0 | ||
497 | diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108 | ||
498 | index XXXXXXX..XXXXXXX 100755 | ||
499 | --- a/tests/qemu-iotests/108 | ||
500 | +++ b/tests/qemu-iotests/108 | ||
501 | @@ -XXX,XX +XXX,XX @@ echo | ||
502 | echo '=== Repairing unreferenced data cluster in new refblock area ===' | ||
503 | echo | ||
504 | |||
505 | -IMGOPTS='cluster_size=512' _make_test_img 64M | ||
506 | +_make_test_img -o 'cluster_size=512' 64M | ||
507 | # Allocate the first 128 kB in the image (first refblock) | ||
508 | $QEMU_IO -c 'write 0 0x1b200' "$TEST_IMG" | _filter_qemu_io | ||
509 | # should be 131072 == 0x20000 | ||
510 | diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112 | ||
511 | index XXXXXXX..XXXXXXX 100755 | ||
512 | --- a/tests/qemu-iotests/112 | ||
513 | +++ b/tests/qemu-iotests/112 | ||
514 | @@ -XXX,XX +XXX,XX @@ echo '=== refcount_bits limits ===' | ||
515 | echo | ||
516 | |||
517 | # Must be positive (non-zero) | ||
518 | -IMGOPTS="$IMGOPTS,refcount_bits=0" _make_test_img 64M | ||
519 | +_make_test_img -o "refcount_bits=0" 64M | ||
520 | # Must be positive (non-negative) | ||
521 | -IMGOPTS="$IMGOPTS,refcount_bits=-1" _make_test_img 64M | ||
522 | +_make_test_img -o "refcount_bits=-1" 64M | ||
523 | # May not exceed 64 | ||
524 | -IMGOPTS="$IMGOPTS,refcount_bits=128" _make_test_img 64M | ||
525 | +_make_test_img -o "refcount_bits=128" 64M | ||
526 | # Must be a power of two | ||
527 | -IMGOPTS="$IMGOPTS,refcount_bits=42" _make_test_img 64M | ||
528 | +_make_test_img -o "refcount_bits=42" 64M | ||
529 | |||
530 | # 1 is the minimum | ||
531 | -IMGOPTS="$IMGOPTS,refcount_bits=1" _make_test_img 64M | ||
532 | +_make_test_img -o "refcount_bits=1" 64M | ||
533 | print_refcount_bits | ||
534 | |||
535 | # 64 is the maximum | ||
536 | -IMGOPTS="$IMGOPTS,refcount_bits=64" _make_test_img 64M | ||
537 | +_make_test_img -o "refcount_bits=64" 64M | ||
538 | print_refcount_bits | ||
539 | |||
540 | # 16 is the default | ||
541 | @@ -XXX,XX +XXX,XX @@ echo '=== refcount_bits and compat=0.10 ===' | ||
542 | echo | ||
543 | |||
544 | # Should work | ||
545 | -IMGOPTS="$IMGOPTS,compat=0.10,refcount_bits=16" _make_test_img 64M | ||
546 | +_make_test_img -o "compat=0.10,refcount_bits=16" 64M | ||
547 | print_refcount_bits | ||
548 | |||
549 | # Should not work | ||
550 | -IMGOPTS="$IMGOPTS,compat=0.10,refcount_bits=1" _make_test_img 64M | ||
551 | -IMGOPTS="$IMGOPTS,compat=0.10,refcount_bits=64" _make_test_img 64M | ||
552 | +_make_test_img -o "compat=0.10,refcount_bits=1" 64M | ||
553 | +_make_test_img -o "compat=0.10,refcount_bits=64" 64M | ||
554 | |||
555 | |||
556 | echo | ||
557 | echo '=== Snapshot limit on refcount_bits=1 ===' | ||
558 | echo | ||
559 | |||
560 | -IMGOPTS="$IMGOPTS,refcount_bits=1" _make_test_img 64M | ||
561 | +_make_test_img -o "refcount_bits=1" 64M | ||
562 | print_refcount_bits | ||
563 | |||
564 | $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io | ||
565 | @@ -XXX,XX +XXX,XX @@ echo | ||
566 | echo '=== Snapshot limit on refcount_bits=2 ===' | ||
567 | echo | ||
568 | |||
569 | -IMGOPTS="$IMGOPTS,refcount_bits=2" _make_test_img 64M | ||
570 | +_make_test_img -o "refcount_bits=2" 64M | ||
571 | print_refcount_bits | ||
572 | |||
573 | $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io | ||
574 | @@ -XXX,XX +XXX,XX @@ echo | ||
575 | echo '=== Compressed clusters with refcount_bits=1 ===' | ||
576 | echo | ||
577 | |||
578 | -IMGOPTS="$IMGOPTS,refcount_bits=1" _make_test_img 64M | ||
579 | +_make_test_img -o "refcount_bits=1" 64M | ||
580 | print_refcount_bits | ||
581 | |||
582 | # Both should fit into a single host cluster; instead of failing to increase the | ||
583 | @@ -XXX,XX +XXX,XX @@ echo | ||
584 | echo '=== MSb set in 64 bit refcount ===' | ||
585 | echo | ||
586 | |||
587 | -IMGOPTS="$IMGOPTS,refcount_bits=64" _make_test_img 64M | ||
588 | +_make_test_img -o "refcount_bits=64" 64M | ||
589 | print_refcount_bits | ||
590 | |||
591 | $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io | ||
592 | @@ -XXX,XX +XXX,XX @@ echo | ||
593 | echo '=== Snapshot on maximum 64 bit refcount value ===' | ||
594 | echo | ||
595 | |||
596 | -IMGOPTS="$IMGOPTS,refcount_bits=64" _make_test_img 64M | ||
597 | +_make_test_img -o "refcount_bits=64" 64M | ||
598 | print_refcount_bits | ||
599 | |||
600 | $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io | ||
601 | @@ -XXX,XX +XXX,XX @@ echo | ||
602 | echo '=== Testing too many references for check ===' | ||
603 | echo | ||
604 | |||
605 | -IMGOPTS="$IMGOPTS,refcount_bits=1" _make_test_img 64M | ||
606 | +_make_test_img -o "refcount_bits=1" 64M | ||
607 | print_refcount_bits | ||
608 | |||
609 | # This cluster should be created at 0x50000 | ||
610 | @@ -XXX,XX +XXX,XX @@ echo | ||
611 | echo '=== Multiple walks necessary during amend ===' | ||
612 | echo | ||
613 | |||
614 | -IMGOPTS="$IMGOPTS,refcount_bits=1,cluster_size=512" _make_test_img 64k | ||
615 | +_make_test_img -o "refcount_bits=1,cluster_size=512" 64k | ||
616 | |||
617 | # Cluster 0 is the image header, clusters 1 to 4 are used by the L1 table, a | ||
618 | # single L2 table, the reftable and a single refblock. This creates 58 data | ||
619 | diff --git a/tests/qemu-iotests/115 b/tests/qemu-iotests/115 | ||
620 | index XXXXXXX..XXXXXXX 100755 | ||
621 | --- a/tests/qemu-iotests/115 | ||
622 | +++ b/tests/qemu-iotests/115 | ||
623 | @@ -XXX,XX +XXX,XX @@ echo | ||
624 | # least 256 MB. We can achieve that by using preallocation=metadata for an image | ||
625 | # which has a guest disk size of 256 MB. | ||
626 | |||
627 | -IMGOPTS="$IMGOPTS,refcount_bits=64,cluster_size=512,preallocation=metadata" \ | ||
628 | - _make_test_img 256M | ||
629 | +_make_test_img -o "refcount_bits=64,cluster_size=512,preallocation=metadata" 256M | ||
630 | |||
631 | # We know for sure that the L1 and refcount tables do not overlap with any other | ||
632 | # structure because the metadata overlap checks would have caught that case. | ||
633 | diff --git a/tests/qemu-iotests/121 b/tests/qemu-iotests/121 | ||
634 | index XXXXXXX..XXXXXXX 100755 | ||
635 | --- a/tests/qemu-iotests/121 | ||
636 | +++ b/tests/qemu-iotests/121 | ||
637 | @@ -XXX,XX +XXX,XX @@ echo | ||
638 | # Preallocation speeds up the write operation, but preallocating everything will | ||
639 | # destroy the purpose of the write; so preallocate one KB less than what would | ||
640 | # cause a reftable growth... | ||
641 | -IMGOPTS='preallocation=metadata,cluster_size=1k' _make_test_img 64512K | ||
642 | +_make_test_img -o 'preallocation=metadata,cluster_size=1k' 64512K | ||
643 | # ...and make the image the desired size afterwards. | ||
644 | $QEMU_IMG resize "$TEST_IMG" 65M | ||
645 | |||
646 | @@ -XXX,XX +XXX,XX @@ echo | ||
647 | echo '--- Test 2 ---' | ||
648 | echo | ||
649 | |||
650 | -IMGOPTS='preallocation=metadata,cluster_size=1k' _make_test_img 64513K | ||
651 | +_make_test_img -o 'preallocation=metadata,cluster_size=1k' 64513K | ||
652 | # This results in an L1 table growth which in turn results in some clusters at | ||
653 | # the start of the image becoming free | ||
654 | $QEMU_IMG resize "$TEST_IMG" 65M | ||
655 | @@ -XXX,XX +XXX,XX @@ echo | ||
656 | echo '=== Allocating a new refcount block must not leave holes in the image ===' | ||
657 | echo | ||
658 | |||
659 | -IMGOPTS='cluster_size=512,refcount_bits=16' _make_test_img 1M | ||
660 | +_make_test_img -o 'cluster_size=512,refcount_bits=16' 1M | ||
661 | |||
662 | # This results in an image with 256 used clusters: the qcow2 header, | ||
663 | # the refcount table, one refcount block, the L1 table, four L2 tables | ||
664 | diff --git a/tests/qemu-iotests/125 b/tests/qemu-iotests/125 | ||
665 | index XXXXXXX..XXXXXXX 100755 | ||
666 | --- a/tests/qemu-iotests/125 | ||
667 | +++ b/tests/qemu-iotests/125 | ||
668 | @@ -XXX,XX +XXX,XX @@ for GROWTH_SIZE in 16 48 80; do | ||
669 | for growth_mode in off metadata falloc full; do | ||
670 | echo "--- cluster_size=$cluster_size growth_size=$GROWTH_SIZE create_mode=$create_mode growth_mode=$growth_mode ---" | ||
671 | |||
672 | - IMGOPTS="preallocation=$create_mode,cluster_size=$cluster_size" _make_test_img ${CREATION_SIZE} | ||
673 | + _make_test_img -o "preallocation=$create_mode,cluster_size=$cluster_size" ${CREATION_SIZE} | ||
674 | $QEMU_IMG resize -f "$IMGFMT" --preallocation=$growth_mode "$TEST_IMG" +${GROWTH_SIZE}K | ||
675 | |||
676 | host_size_0=$(get_image_size_on_host) | ||
677 | diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137 | ||
678 | index XXXXXXX..XXXXXXX 100755 | ||
679 | --- a/tests/qemu-iotests/137 | ||
680 | +++ b/tests/qemu-iotests/137 | ||
681 | @@ -XXX,XX +XXX,XX @@ $QEMU_IO \ | ||
682 | -c "reopen -o cache-clean-interval=-1" \ | ||
683 | "$TEST_IMG" | _filter_qemu_io | ||
684 | |||
685 | -IMGOPTS="cluster_size=256k" _make_test_img 32P | ||
686 | +_make_test_img -o "cluster_size=256k" 32P | ||
687 | $QEMU_IO \ | ||
688 | -c "reopen -o l2-cache-entry-size=512,l2-cache-size=1T" \ | ||
689 | "$TEST_IMG" | _filter_qemu_io | ||
690 | diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138 | ||
691 | index XXXXXXX..XXXXXXX 100755 | ||
692 | --- a/tests/qemu-iotests/138 | ||
693 | +++ b/tests/qemu-iotests/138 | ||
694 | @@ -XXX,XX +XXX,XX @@ echo | ||
695 | echo '=== Check on an image with a multiple of 2^32 clusters ===' | ||
696 | echo | ||
697 | |||
698 | -IMGOPTS=$(_optstr_add "$IMGOPTS" "cluster_size=512") \ | ||
699 | - _make_test_img 512 | ||
700 | +_make_test_img -o "cluster_size=512" 512 | ||
701 | |||
702 | # Allocate L2 table | ||
703 | $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io | ||
704 | diff --git a/tests/qemu-iotests/175 b/tests/qemu-iotests/175 | ||
705 | index XXXXXXX..XXXXXXX 100755 | ||
706 | --- a/tests/qemu-iotests/175 | ||
707 | +++ b/tests/qemu-iotests/175 | ||
708 | @@ -XXX,XX +XXX,XX @@ stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $min_block | ||
709 | for mode in off full falloc; do | ||
710 | echo | ||
711 | echo "== creating image with preallocation $mode ==" | ||
712 | - IMGOPTS=preallocation=$mode _make_test_img $size | _filter_imgfmt | ||
713 | + _make_test_img -o preallocation=$mode $size | _filter_imgfmt | ||
714 | stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $min_blocks $size | ||
715 | done | ||
716 | |||
717 | diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190 | ||
718 | index XXXXXXX..XXXXXXX 100755 | ||
719 | --- a/tests/qemu-iotests/190 | ||
720 | +++ b/tests/qemu-iotests/190 | ||
721 | @@ -XXX,XX +XXX,XX @@ _supported_proto file | ||
722 | echo "== Huge file ==" | ||
723 | echo | ||
724 | |||
725 | -IMGOPTS='cluster_size=2M' _make_test_img 2T | ||
726 | +_make_test_img -o 'cluster_size=2M' 2T | ||
727 | |||
728 | $QEMU_IMG measure -O raw -f qcow2 "$TEST_IMG" | ||
729 | $QEMU_IMG measure -O qcow2 -o cluster_size=64k -f qcow2 "$TEST_IMG" | ||
730 | diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191 | ||
731 | index XXXXXXX..XXXXXXX 100755 | ||
732 | --- a/tests/qemu-iotests/191 | ||
733 | +++ b/tests/qemu-iotests/191 | ||
734 | @@ -XXX,XX +XXX,XX @@ echo === Preparing and starting VM === | ||
735 | echo | ||
736 | |||
737 | TEST_IMG="${TEST_IMG}.base" _make_test_img $size | ||
738 | -IMGOPTS=$(_optstr_add "$IMGOPTS" "backing_fmt=$IMGFMT") \ | ||
739 | - TEST_IMG="${TEST_IMG}.mid" _make_test_img -b "${TEST_IMG}.base" | ||
740 | +TEST_IMG="${TEST_IMG}.mid" _make_test_img -o "backing_fmt=$IMGFMT" -b "${TEST_IMG}.base" | ||
741 | _make_test_img -b "${TEST_IMG}.mid" | ||
742 | TEST_IMG="${TEST_IMG}.ovl2" _make_test_img -b "${TEST_IMG}.mid" | ||
743 | |||
744 | diff --git a/tests/qemu-iotests/220 b/tests/qemu-iotests/220 | ||
745 | index XXXXXXX..XXXXXXX 100755 | ||
746 | --- a/tests/qemu-iotests/220 | ||
747 | +++ b/tests/qemu-iotests/220 | ||
63 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | 748 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 |
64 | _supported_fmt qcow2 | 749 | _supported_fmt qcow2 |
65 | _supported_proto file | 750 | _supported_proto file |
66 | _supported_os Linux | 751 | _supported_os Linux |
67 | -_default_cache_mode "none" | 752 | +# To use a different refcount width but 16 bits we need compat=1.1 |
68 | -_supported_cache_modes "writethrough" "none" "writeback" | 753 | +_unsupported_imgopts 'compat=0.10' |
69 | +_default_cache_mode none | 754 | |
70 | +_supported_cache_modes writethrough none writeback | 755 | echo "== Creating huge file ==" |
71 | 756 | ||
72 | size=1G | 757 | @@ -XXX,XX +XXX,XX @@ echo "== Creating huge file ==" |
73 | 758 | # of a HUGE (but very sparse) file. tmpfs works, ext4 does not. | |
759 | _require_large_file 513T | ||
760 | |||
761 | -IMGOPTS='cluster_size=2M,refcount_bits=1' _make_test_img 513T | ||
762 | +_make_test_img -o 'cluster_size=2M,refcount_bits=1' 513T | ||
763 | |||
764 | echo "== Populating refcounts ==" | ||
765 | # We want an image with 256M refcounts * 2M clusters = 512T referenced. | ||
766 | diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243 | ||
767 | index XXXXXXX..XXXXXXX 100755 | ||
768 | --- a/tests/qemu-iotests/243 | ||
769 | +++ b/tests/qemu-iotests/243 | ||
770 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
771 | _supported_fmt qcow2 | ||
772 | _supported_proto file | ||
773 | _supported_os Linux | ||
774 | +# External data files do not work with compat=0.10 | ||
775 | +_unsupported_imgopts 'compat=0.10' | ||
776 | |||
777 | for mode in off metadata falloc full; do | ||
778 | |||
779 | @@ -XXX,XX +XXX,XX @@ for mode in off metadata falloc full; do | ||
780 | echo "=== preallocation=$mode ===" | ||
781 | echo | ||
782 | |||
783 | - IMGOPTS="preallocation=$mode" _make_test_img 64M | ||
784 | + _make_test_img -o "preallocation=$mode" 64M | ||
785 | |||
786 | printf "File size: " | ||
787 | du -b $TEST_IMG | cut -f1 | ||
788 | @@ -XXX,XX +XXX,XX @@ for mode in off metadata falloc full; do | ||
789 | echo "=== External data file: preallocation=$mode ===" | ||
790 | echo | ||
791 | |||
792 | - IMGOPTS="data_file=$TEST_IMG.data,preallocation=$mode" _make_test_img 64M | ||
793 | + _make_test_img -o "data_file=$TEST_IMG.data,preallocation=$mode" 64M | ||
794 | |||
795 | echo -n "qcow2 file size: " | ||
796 | du -b $TEST_IMG | cut -f1 | ||
797 | diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244 | ||
798 | index XXXXXXX..XXXXXXX 100755 | ||
799 | --- a/tests/qemu-iotests/244 | ||
800 | +++ b/tests/qemu-iotests/244 | ||
801 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
802 | _supported_fmt qcow2 | ||
803 | _supported_proto file | ||
804 | _supported_os Linux | ||
805 | +# External data files do not work with compat=0.10 | ||
806 | +_unsupported_imgopts 'compat=0.10' | ||
807 | |||
808 | echo | ||
809 | echo "=== Create and open image with external data file ===" | ||
810 | echo | ||
811 | |||
812 | echo "With data file name in the image:" | ||
813 | -IMGOPTS="data_file=$TEST_IMG.data" _make_test_img 64M | ||
814 | +_make_test_img -o "data_file=$TEST_IMG.data" 64M | ||
815 | _check_test_img | ||
816 | |||
817 | $QEMU_IO -c "open $TEST_IMG" -c "read -P 0 0 64k" 2>&1 | _filter_qemu_io | _filter_testdir | ||
818 | @@ -XXX,XX +XXX,XX @@ echo | ||
819 | echo "=== Standalone image with external data file (efficient) ===" | ||
820 | echo | ||
821 | |||
822 | -IMGOPTS="data_file=$TEST_IMG.data" _make_test_img 64M | ||
823 | +_make_test_img -o "data_file=$TEST_IMG.data" 64M | ||
824 | |||
825 | echo -n "qcow2 file size before I/O: " | ||
826 | du -b $TEST_IMG | cut -f1 | ||
827 | @@ -XXX,XX +XXX,XX @@ echo | ||
828 | echo "=== Standalone image with external data file (valid raw) ===" | ||
829 | echo | ||
830 | |||
831 | -IMGOPTS="data_file=$TEST_IMG.data,data_file_raw=on" _make_test_img 64M | ||
832 | +_make_test_img -o "data_file=$TEST_IMG.data,data_file_raw=on" 64M | ||
833 | |||
834 | echo -n "qcow2 file size before I/O: " | ||
835 | du -b $TEST_IMG | cut -f1 | ||
836 | @@ -XXX,XX +XXX,XX @@ echo | ||
837 | echo "=== bdrv_co_block_status test for file and offset=0 ===" | ||
838 | echo | ||
839 | |||
840 | -IMGOPTS="data_file=$TEST_IMG.data" _make_test_img 64M | ||
841 | +_make_test_img -o "data_file=$TEST_IMG.data" 64M | ||
842 | |||
843 | $QEMU_IO -c 'write -P 0x11 0 1M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io | ||
844 | $QEMU_IO -c 'read -P 0x11 0 1M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io | ||
845 | diff --git a/tests/qemu-iotests/250 b/tests/qemu-iotests/250 | ||
846 | index XXXXXXX..XXXXXXX 100755 | ||
847 | --- a/tests/qemu-iotests/250 | ||
848 | +++ b/tests/qemu-iotests/250 | ||
849 | @@ -XXX,XX +XXX,XX @@ disk_usage() | ||
850 | } | ||
851 | |||
852 | size=2100M | ||
853 | -IMGOPTS="cluster_size=1M,preallocation=metadata" | ||
854 | |||
855 | -_make_test_img $size | ||
856 | +_make_test_img -o "cluster_size=1M,preallocation=metadata" $size | ||
857 | $QEMU_IO -c 'discard 0 10M' -c 'discard 2090M 10M' \ | ||
858 | -c 'write 2090M 10M' -c 'write 0 10M' "$TEST_IMG" | _filter_qemu_io | ||
859 | |||
860 | diff --git a/tests/qemu-iotests/265 b/tests/qemu-iotests/265 | ||
861 | index XXXXXXX..XXXXXXX 100755 | ||
862 | --- a/tests/qemu-iotests/265 | ||
863 | +++ b/tests/qemu-iotests/265 | ||
864 | @@ -XXX,XX +XXX,XX @@ _supported_os Linux | ||
865 | echo '--- Writing to the image ---' | ||
866 | |||
867 | # Reduce cluster size so we get more and quicker I/O | ||
868 | -IMGOPTS='cluster_size=4096' _make_test_img 1M | ||
869 | +_make_test_img -o 'cluster_size=4096' 1M | ||
870 | (for ((kb = 1024 - 4; kb >= 0; kb -= 4)); do \ | ||
871 | echo "aio_write -P 42 $((kb + 1))k 2k"; \ | ||
872 | done) \ | ||
74 | -- | 873 | -- |
75 | 2.21.0 | 874 | 2.24.1 |
76 | 875 | ||
77 | 876 | diff view generated by jsdifflib |
New patch | |||
---|---|---|---|
1 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
2 | Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> | ||
3 | Message-id: 20191107163708.833192-13-mreitz@redhat.com | ||
4 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
5 | --- | ||
6 | tests/qemu-iotests/071 | 4 ++-- | ||
7 | tests/qemu-iotests/174 | 2 +- | ||
8 | tests/qemu-iotests/178 | 4 ++-- | ||
9 | tests/qemu-iotests/197 | 4 ++-- | ||
10 | tests/qemu-iotests/215 | 4 ++-- | ||
11 | 5 files changed, 9 insertions(+), 9 deletions(-) | ||
1 | 12 | ||
13 | diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071 | ||
14 | index XXXXXXX..XXXXXXX 100755 | ||
15 | --- a/tests/qemu-iotests/071 | ||
16 | +++ b/tests/qemu-iotests/071 | ||
17 | @@ -XXX,XX +XXX,XX @@ echo | ||
18 | echo "=== Testing blkverify through filename ===" | ||
19 | echo | ||
20 | |||
21 | -TEST_IMG="$TEST_IMG.base" IMGOPTS="" IMGFMT="raw" _make_test_img $IMG_SIZE |\ | ||
22 | +TEST_IMG="$TEST_IMG.base" IMGFMT="raw" _make_test_img --no-opts $IMG_SIZE |\ | ||
23 | _filter_imgfmt | ||
24 | _make_test_img $IMG_SIZE | ||
25 | $QEMU_IO -c "open -o driver=raw,file.driver=blkverify,file.raw.filename=$TEST_IMG.base $TEST_IMG" \ | ||
26 | @@ -XXX,XX +XXX,XX @@ echo | ||
27 | echo "=== Testing blkverify through file blockref ===" | ||
28 | echo | ||
29 | |||
30 | -TEST_IMG="$TEST_IMG.base" IMGOPTS="" IMGFMT="raw" _make_test_img $IMG_SIZE |\ | ||
31 | +TEST_IMG="$TEST_IMG.base" IMGFMT="raw" _make_test_img --no-opts $IMG_SIZE |\ | ||
32 | _filter_imgfmt | ||
33 | _make_test_img $IMG_SIZE | ||
34 | $QEMU_IO -c "open -o driver=raw,file.driver=blkverify,file.raw.filename=$TEST_IMG.base,file.test.driver=$IMGFMT,file.test.file.filename=$TEST_IMG" \ | ||
35 | diff --git a/tests/qemu-iotests/174 b/tests/qemu-iotests/174 | ||
36 | index XXXXXXX..XXXXXXX 100755 | ||
37 | --- a/tests/qemu-iotests/174 | ||
38 | +++ b/tests/qemu-iotests/174 | ||
39 | @@ -XXX,XX +XXX,XX @@ _unsupported_fmt raw | ||
40 | |||
41 | |||
42 | size=256K | ||
43 | -IMGFMT=raw IMGKEYSECRET= IMGOPTS= _make_test_img $size | _filter_imgfmt | ||
44 | +IMGFMT=raw IMGKEYSECRET= _make_test_img --no-opts $size | _filter_imgfmt | ||
45 | |||
46 | echo | ||
47 | echo "== reading wrong format should fail ==" | ||
48 | diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178 | ||
49 | index XXXXXXX..XXXXXXX 100755 | ||
50 | --- a/tests/qemu-iotests/178 | ||
51 | +++ b/tests/qemu-iotests/178 | ||
52 | @@ -XXX,XX +XXX,XX @@ $QEMU_IMG measure -O foo "$TEST_IMG" # unknown image file format | ||
53 | |||
54 | make_test_img_with_fmt() { | ||
55 | # Shadow global variables within this function | ||
56 | - local IMGFMT="$1" IMGOPTS="" | ||
57 | - _make_test_img "$2" | ||
58 | + local IMGFMT="$1" | ||
59 | + _make_test_img --no-opts "$2" | ||
60 | } | ||
61 | |||
62 | qemu_io_with_fmt() { | ||
63 | diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197 | ||
64 | index XXXXXXX..XXXXXXX 100755 | ||
65 | --- a/tests/qemu-iotests/197 | ||
66 | +++ b/tests/qemu-iotests/197 | ||
67 | @@ -XXX,XX +XXX,XX @@ if [ "$IMGFMT" = "vpc" ]; then | ||
68 | fi | ||
69 | _make_test_img 4G | ||
70 | $QEMU_IO -c "write -P 55 3G 1k" "$TEST_IMG" | _filter_qemu_io | ||
71 | -IMGPROTO=file IMGFMT=qcow2 IMGOPTS= TEST_IMG_FILE="$TEST_WRAP" \ | ||
72 | - _make_test_img -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create | ||
73 | +IMGPROTO=file IMGFMT=qcow2 TEST_IMG_FILE="$TEST_WRAP" \ | ||
74 | + _make_test_img --no-opts -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create | ||
75 | $QEMU_IO -f qcow2 -c "write -z -u 1M 64k" "$TEST_WRAP" | _filter_qemu_io | ||
76 | |||
77 | # Ensure that a read of two clusters, but where one is already allocated, | ||
78 | diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215 | ||
79 | index XXXXXXX..XXXXXXX 100755 | ||
80 | --- a/tests/qemu-iotests/215 | ||
81 | +++ b/tests/qemu-iotests/215 | ||
82 | @@ -XXX,XX +XXX,XX @@ if [ "$IMGFMT" = "vpc" ]; then | ||
83 | fi | ||
84 | _make_test_img 4G | ||
85 | $QEMU_IO -c "write -P 55 3G 1k" "$TEST_IMG" | _filter_qemu_io | ||
86 | -IMGPROTO=file IMGFMT=qcow2 IMGOPTS= TEST_IMG_FILE="$TEST_WRAP" \ | ||
87 | - _make_test_img -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create | ||
88 | +IMGPROTO=file IMGFMT=qcow2 TEST_IMG_FILE="$TEST_WRAP" \ | ||
89 | + _make_test_img --no-opts -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create | ||
90 | $QEMU_IO -f qcow2 -c "write -z -u 1M 64k" "$TEST_WRAP" | _filter_qemu_io | ||
91 | |||
92 | # Ensure that a read of two clusters, but where one is already allocated, | ||
93 | -- | ||
94 | 2.24.1 | ||
95 | |||
96 | diff view generated by jsdifflib |
New patch | |||
---|---|---|---|
1 | Overwriting IMGOPTS means ignoring all user-supplied options, which is | ||
2 | not what we want. Replace the current IMGOPTS use by a new BACKING_FILE | ||
3 | variable. | ||
1 | 4 | ||
5 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
6 | Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> | ||
7 | Message-id: 20191107163708.833192-14-mreitz@redhat.com | ||
8 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
9 | --- | ||
10 | tests/qemu-iotests/267 | 12 ++++++++---- | ||
11 | 1 file changed, 8 insertions(+), 4 deletions(-) | ||
12 | |||
13 | diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267 | ||
14 | index XXXXXXX..XXXXXXX 100755 | ||
15 | --- a/tests/qemu-iotests/267 | ||
16 | +++ b/tests/qemu-iotests/267 | ||
17 | @@ -XXX,XX +XXX,XX @@ size=128M | ||
18 | |||
19 | run_test() | ||
20 | { | ||
21 | - _make_test_img $size | ||
22 | + if [ -n "$BACKING_FILE" ]; then | ||
23 | + _make_test_img -b "$BACKING_FILE" $size | ||
24 | + else | ||
25 | + _make_test_img $size | ||
26 | + fi | ||
27 | printf "savevm snap0\ninfo snapshots\nloadvm snap0\n" | run_qemu "$@" | _filter_date | ||
28 | } | ||
29 | |||
30 | @@ -XXX,XX +XXX,XX @@ echo | ||
31 | |||
32 | TEST_IMG="$TEST_IMG.base" _make_test_img $size | ||
33 | |||
34 | -IMGOPTS="backing_file=$TEST_IMG.base" \ | ||
35 | +BACKING_FILE="$TEST_IMG.base" \ | ||
36 | run_test -blockdev driver=file,filename="$TEST_IMG.base",node-name=backing-file \ | ||
37 | -blockdev driver=file,filename="$TEST_IMG",node-name=file \ | ||
38 | -blockdev driver=$IMGFMT,file=file,backing=backing-file,node-name=fmt | ||
39 | |||
40 | -IMGOPTS="backing_file=$TEST_IMG.base" \ | ||
41 | +BACKING_FILE="$TEST_IMG.base" \ | ||
42 | run_test -blockdev driver=file,filename="$TEST_IMG.base",node-name=backing-file \ | ||
43 | -blockdev driver=$IMGFMT,file=backing-file,node-name=backing-fmt \ | ||
44 | -blockdev driver=file,filename="$TEST_IMG",node-name=file \ | ||
45 | @@ -XXX,XX +XXX,XX @@ echo | ||
46 | echo "=== -blockdev with NBD server on the backing file ===" | ||
47 | echo | ||
48 | |||
49 | -IMGOPTS="backing_file=$TEST_IMG.base" _make_test_img $size | ||
50 | +_make_test_img -b "$TEST_IMG.base" $size | ||
51 | cat <<EOF | | ||
52 | nbd_server_start unix:$SOCK_DIR/nbd | ||
53 | nbd_server_add -w backing-fmt | ||
54 | -- | ||
55 | 2.24.1 | ||
56 | |||
57 | diff view generated by jsdifflib |
New patch | |||
---|---|---|---|
1 | Use _make_test_img whenever possible. This way, we will not ignore | ||
2 | user-specified image options. | ||
1 | 3 | ||
4 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
5 | Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> | ||
6 | Message-id: 20191107163708.833192-15-mreitz@redhat.com | ||
7 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
8 | --- | ||
9 | tests/qemu-iotests/094 | 2 +- | ||
10 | tests/qemu-iotests/111 | 3 +-- | ||
11 | tests/qemu-iotests/123 | 2 +- | ||
12 | tests/qemu-iotests/153 | 2 +- | ||
13 | tests/qemu-iotests/200 | 4 ++-- | ||
14 | 5 files changed, 6 insertions(+), 7 deletions(-) | ||
15 | |||
16 | diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094 | ||
17 | index XXXXXXX..XXXXXXX 100755 | ||
18 | --- a/tests/qemu-iotests/094 | ||
19 | +++ b/tests/qemu-iotests/094 | ||
20 | @@ -XXX,XX +XXX,XX @@ _supported_proto nbd | ||
21 | _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" | ||
22 | |||
23 | _make_test_img 64M | ||
24 | -$QEMU_IMG create -f $IMGFMT "$TEST_DIR/source.$IMGFMT" 64M | _filter_img_create | ||
25 | +TEST_IMG_FILE="$TEST_DIR/source.$IMGFMT" IMGPROTO=file _make_test_img 64M | ||
26 | |||
27 | _launch_qemu -drive if=none,id=src,file="$TEST_DIR/source.$IMGFMT",format=raw \ | ||
28 | -nodefaults | ||
29 | diff --git a/tests/qemu-iotests/111 b/tests/qemu-iotests/111 | ||
30 | index XXXXXXX..XXXXXXX 100755 | ||
31 | --- a/tests/qemu-iotests/111 | ||
32 | +++ b/tests/qemu-iotests/111 | ||
33 | @@ -XXX,XX +XXX,XX @@ _supported_fmt qed qcow qcow2 vmdk | ||
34 | _supported_proto file | ||
35 | _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" | ||
36 | |||
37 | -$QEMU_IMG create -f $IMGFMT -b "$TEST_IMG.inexistent" "$TEST_IMG" 2>&1 \ | ||
38 | - | _filter_testdir | _filter_imgfmt | ||
39 | +_make_test_img -b "$TEST_IMG.inexistent" | ||
40 | |||
41 | # success, all done | ||
42 | echo '*** done' | ||
43 | diff --git a/tests/qemu-iotests/123 b/tests/qemu-iotests/123 | ||
44 | index XXXXXXX..XXXXXXX 100755 | ||
45 | --- a/tests/qemu-iotests/123 | ||
46 | +++ b/tests/qemu-iotests/123 | ||
47 | @@ -XXX,XX +XXX,XX @@ _supported_os Linux | ||
48 | SRC_IMG="$TEST_DIR/source.$IMGFMT" | ||
49 | |||
50 | _make_test_img 1M | ||
51 | -$QEMU_IMG create -f $IMGFMT "$SRC_IMG" 1M | _filter_img_create | ||
52 | +TEST_IMG_FILE=$SRC_IMG IMGPROTO=file _make_test_img 1M | ||
53 | |||
54 | $QEMU_IO -c 'write -P 42 0 1M' "$SRC_IMG" | _filter_qemu_io | ||
55 | |||
56 | diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153 | ||
57 | index XXXXXXX..XXXXXXX 100755 | ||
58 | --- a/tests/qemu-iotests/153 | ||
59 | +++ b/tests/qemu-iotests/153 | ||
60 | @@ -XXX,XX +XXX,XX @@ for opts1 in "" "read-only=on" "read-only=on,force-share=on"; do | ||
61 | |||
62 | echo | ||
63 | echo "== Creating test image ==" | ||
64 | - $QEMU_IMG create -f $IMGFMT "${TEST_IMG}" -b ${TEST_IMG}.base | _filter_img_create | ||
65 | + _make_test_img -b "${TEST_IMG}.base" | ||
66 | |||
67 | echo | ||
68 | echo "== Launching QEMU, opts: '$opts1' ==" | ||
69 | diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200 | ||
70 | index XXXXXXX..XXXXXXX 100755 | ||
71 | --- a/tests/qemu-iotests/200 | ||
72 | +++ b/tests/qemu-iotests/200 | ||
73 | @@ -XXX,XX +XXX,XX @@ _supported_proto file | ||
74 | BACKING_IMG="${TEST_DIR}/backing.img" | ||
75 | TEST_IMG="${TEST_DIR}/test.img" | ||
76 | |||
77 | -${QEMU_IMG} create -f $IMGFMT "${BACKING_IMG}" 512M | _filter_img_create | ||
78 | -${QEMU_IMG} create -f $IMGFMT -F $IMGFMT "${TEST_IMG}" -b "${BACKING_IMG}" 512M | _filter_img_create | ||
79 | +TEST_IMG="$BACKING_IMG" _make_test_img 512M | ||
80 | +_make_test_img -F $IMGFMT -b "$BACKING_IMG" 512M | ||
81 | |||
82 | ${QEMU_IO} -c "write -P 0xa5 512 300M" "${BACKING_IMG}" | _filter_qemu_io | ||
83 | |||
84 | -- | ||
85 | 2.24.1 | ||
86 | |||
87 | diff view generated by jsdifflib |
1 | streamOptimized does not support writes that do not span exactly one | 1 | Just rm will not delete external data files. Use _rm_test_img every |
---|---|---|---|
2 | cluster. Furthermore, it cannot rewrite already allocated clusters. | 2 | time we delete a test image. |
3 | As such, many iotests do not work with it. Disable them. | 3 | |
4 | (In the process, clean up the indentation of every _cleanup() this patch | ||
5 | touches.) | ||
6 | |||
7 | ((Also, use quotes consistently. I am happy to see unquoted instances | ||
8 | like "rm -rf $TEST_DIR/..." go.)) | ||
4 | 9 | ||
5 | Signed-off-by: Max Reitz <mreitz@redhat.com> | 10 | Signed-off-by: Max Reitz <mreitz@redhat.com> |
6 | Message-id: 20190815153638.4600-6-mreitz@redhat.com | 11 | Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> |
7 | Reviewed-by: John Snow <jsnow@redhat.com> | 12 | Message-id: 20191107163708.833192-16-mreitz@redhat.com |
8 | Signed-off-by: Max Reitz <mreitz@redhat.com> | 13 | Signed-off-by: Max Reitz <mreitz@redhat.com> |
9 | --- | 14 | --- |
10 | tests/qemu-iotests/002 | 1 + | 15 | tests/qemu-iotests/019 | 6 +++--- |
11 | tests/qemu-iotests/003 | 1 + | 16 | tests/qemu-iotests/020 | 6 +++--- |
12 | tests/qemu-iotests/005 | 3 ++- | 17 | tests/qemu-iotests/024 | 10 +++++----- |
13 | tests/qemu-iotests/009 | 1 + | 18 | tests/qemu-iotests/028 | 2 +- |
14 | tests/qemu-iotests/010 | 1 + | 19 | tests/qemu-iotests/029 | 2 +- |
15 | tests/qemu-iotests/011 | 1 + | 20 | tests/qemu-iotests/043 | 4 +++- |
16 | tests/qemu-iotests/017 | 3 ++- | 21 | tests/qemu-iotests/048 | 2 +- |
17 | tests/qemu-iotests/018 | 3 ++- | 22 | tests/qemu-iotests/050 | 4 ++-- |
18 | tests/qemu-iotests/019 | 3 ++- | 23 | tests/qemu-iotests/053 | 4 ++-- |
19 | tests/qemu-iotests/020 | 3 ++- | 24 | tests/qemu-iotests/058 | 2 +- |
20 | tests/qemu-iotests/027 | 1 + | 25 | tests/qemu-iotests/059 | 2 +- |
21 | tests/qemu-iotests/032 | 1 + | 26 | tests/qemu-iotests/061 | 2 +- |
22 | tests/qemu-iotests/033 | 1 + | 27 | tests/qemu-iotests/063 | 6 ++++-- |
23 | tests/qemu-iotests/034 | 3 ++- | 28 | tests/qemu-iotests/069 | 2 +- |
24 | tests/qemu-iotests/037 | 3 ++- | 29 | tests/qemu-iotests/074 | 2 +- |
25 | tests/qemu-iotests/063 | 3 ++- | 30 | tests/qemu-iotests/080 | 2 +- |
26 | tests/qemu-iotests/072 | 1 + | 31 | tests/qemu-iotests/081 | 6 +++--- |
27 | tests/qemu-iotests/105 | 3 ++- | 32 | tests/qemu-iotests/085 | 9 ++++++--- |
28 | tests/qemu-iotests/197 | 1 + | 33 | tests/qemu-iotests/088 | 2 +- |
29 | tests/qemu-iotests/215 | 1 + | 34 | tests/qemu-iotests/092 | 2 +- |
30 | tests/qemu-iotests/251 | 1 + | 35 | tests/qemu-iotests/094 | 2 +- |
31 | 21 files changed, 30 insertions(+), 9 deletions(-) | 36 | tests/qemu-iotests/095 | 5 +++-- |
37 | tests/qemu-iotests/099 | 7 ++++--- | ||
38 | tests/qemu-iotests/109 | 4 ++-- | ||
39 | tests/qemu-iotests/110 | 4 ++-- | ||
40 | tests/qemu-iotests/122 | 6 ++++-- | ||
41 | tests/qemu-iotests/123 | 2 +- | ||
42 | tests/qemu-iotests/141 | 4 +++- | ||
43 | tests/qemu-iotests/142 | 2 +- | ||
44 | tests/qemu-iotests/144 | 4 +++- | ||
45 | tests/qemu-iotests/153 | 10 +++------- | ||
46 | tests/qemu-iotests/156 | 8 ++++++-- | ||
47 | tests/qemu-iotests/159 | 2 +- | ||
48 | tests/qemu-iotests/160 | 3 ++- | ||
49 | tests/qemu-iotests/161 | 4 ++-- | ||
50 | tests/qemu-iotests/170 | 2 +- | ||
51 | tests/qemu-iotests/172 | 6 +++--- | ||
52 | tests/qemu-iotests/173 | 3 ++- | ||
53 | tests/qemu-iotests/178 | 2 +- | ||
54 | tests/qemu-iotests/182 | 2 +- | ||
55 | tests/qemu-iotests/183 | 2 +- | ||
56 | tests/qemu-iotests/185 | 4 ++-- | ||
57 | tests/qemu-iotests/187 | 6 +++--- | ||
58 | tests/qemu-iotests/190 | 2 +- | ||
59 | tests/qemu-iotests/191 | 6 +++--- | ||
60 | tests/qemu-iotests/195 | 2 +- | ||
61 | tests/qemu-iotests/197 | 2 +- | ||
62 | tests/qemu-iotests/200 | 3 ++- | ||
63 | tests/qemu-iotests/215 | 2 +- | ||
64 | tests/qemu-iotests/225 | 2 +- | ||
65 | tests/qemu-iotests/229 | 3 ++- | ||
66 | tests/qemu-iotests/232 | 4 +++- | ||
67 | tests/qemu-iotests/243 | 2 +- | ||
68 | tests/qemu-iotests/244 | 4 ++-- | ||
69 | tests/qemu-iotests/247 | 4 +++- | ||
70 | tests/qemu-iotests/249 | 4 ++-- | ||
71 | tests/qemu-iotests/252 | 2 +- | ||
72 | 57 files changed, 118 insertions(+), 95 deletions(-) | ||
32 | 73 | ||
33 | diff --git a/tests/qemu-iotests/002 b/tests/qemu-iotests/002 | ||
34 | index XXXXXXX..XXXXXXX 100755 | ||
35 | --- a/tests/qemu-iotests/002 | ||
36 | +++ b/tests/qemu-iotests/002 | ||
37 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
38 | |||
39 | _supported_fmt generic | ||
40 | _supported_proto generic | ||
41 | +_unsupported_imgopts "subformat=streamOptimized" | ||
42 | |||
43 | |||
44 | size=128M | ||
45 | diff --git a/tests/qemu-iotests/003 b/tests/qemu-iotests/003 | ||
46 | index XXXXXXX..XXXXXXX 100755 | ||
47 | --- a/tests/qemu-iotests/003 | ||
48 | +++ b/tests/qemu-iotests/003 | ||
49 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
50 | |||
51 | _supported_fmt generic | ||
52 | _supported_proto generic | ||
53 | +_unsupported_imgopts "subformat=streamOptimized" | ||
54 | |||
55 | size=128M | ||
56 | offset=67M | ||
57 | diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005 | ||
58 | index XXXXXXX..XXXXXXX 100755 | ||
59 | --- a/tests/qemu-iotests/005 | ||
60 | +++ b/tests/qemu-iotests/005 | ||
61 | @@ -XXX,XX +XXX,XX @@ _supported_fmt generic | ||
62 | _supported_proto generic | ||
63 | _supported_os Linux | ||
64 | _unsupported_imgopts "subformat=twoGbMaxExtentFlat" \ | ||
65 | - "subformat=twoGbMaxExtentSparse" | ||
66 | + "subformat=twoGbMaxExtentSparse" \ | ||
67 | + "subformat=streamOptimized" | ||
68 | |||
69 | # vpc is limited to 127GB, so we can't test it here | ||
70 | if [ "$IMGFMT" = "vpc" ]; then | ||
71 | diff --git a/tests/qemu-iotests/009 b/tests/qemu-iotests/009 | ||
72 | index XXXXXXX..XXXXXXX 100755 | ||
73 | --- a/tests/qemu-iotests/009 | ||
74 | +++ b/tests/qemu-iotests/009 | ||
75 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
76 | |||
77 | _supported_fmt generic | ||
78 | _supported_proto generic | ||
79 | +_unsupported_imgopts "subformat=streamOptimized" | ||
80 | |||
81 | |||
82 | size=6G | ||
83 | diff --git a/tests/qemu-iotests/010 b/tests/qemu-iotests/010 | ||
84 | index XXXXXXX..XXXXXXX 100755 | ||
85 | --- a/tests/qemu-iotests/010 | ||
86 | +++ b/tests/qemu-iotests/010 | ||
87 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
88 | |||
89 | _supported_fmt generic | ||
90 | _supported_proto generic | ||
91 | +_unsupported_imgopts "subformat=streamOptimized" | ||
92 | |||
93 | |||
94 | size=6G | ||
95 | diff --git a/tests/qemu-iotests/011 b/tests/qemu-iotests/011 | ||
96 | index XXXXXXX..XXXXXXX 100755 | ||
97 | --- a/tests/qemu-iotests/011 | ||
98 | +++ b/tests/qemu-iotests/011 | ||
99 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
100 | |||
101 | _supported_fmt generic | ||
102 | _supported_proto generic | ||
103 | +_unsupported_imgopts "subformat=streamOptimized" | ||
104 | |||
105 | |||
106 | size=6G | ||
107 | diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017 | ||
108 | index XXXXXXX..XXXXXXX 100755 | ||
109 | --- a/tests/qemu-iotests/017 | ||
110 | +++ b/tests/qemu-iotests/017 | ||
111 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
112 | _supported_fmt qcow qcow2 vmdk qed | ||
113 | _supported_proto generic | ||
114 | _unsupported_proto vxhs | ||
115 | -_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" | ||
116 | +_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" \ | ||
117 | + "subformat=streamOptimized" | ||
118 | |||
119 | TEST_OFFSETS="0 4294967296" | ||
120 | |||
121 | diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018 | ||
122 | index XXXXXXX..XXXXXXX 100755 | ||
123 | --- a/tests/qemu-iotests/018 | ||
124 | +++ b/tests/qemu-iotests/018 | ||
125 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
126 | _supported_fmt qcow qcow2 vmdk qed | ||
127 | _supported_proto file | ||
128 | _supported_os Linux | ||
129 | -_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" | ||
130 | +_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" \ | ||
131 | + "streamOptimized" | ||
132 | |||
133 | TEST_OFFSETS="0 4294967296" | ||
134 | |||
135 | diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019 | 74 | diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019 |
136 | index XXXXXXX..XXXXXXX 100755 | 75 | index XXXXXXX..XXXXXXX 100755 |
137 | --- a/tests/qemu-iotests/019 | 76 | --- a/tests/qemu-iotests/019 |
138 | +++ b/tests/qemu-iotests/019 | 77 | +++ b/tests/qemu-iotests/019 |
139 | @@ -XXX,XX +XXX,XX @@ _supported_proto file | 78 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! |
140 | _supported_os Linux | 79 | |
141 | _unsupported_imgopts "subformat=monolithicFlat" \ | 80 | _cleanup() |
142 | "subformat=twoGbMaxExtentFlat" \ | 81 | { |
143 | - "subformat=twoGbMaxExtentSparse" | 82 | - _cleanup_test_img |
144 | + "subformat=twoGbMaxExtentSparse" \ | 83 | - rm -f "$TEST_IMG.base" |
145 | + "subformat=streamOptimized" | 84 | - rm -f "$TEST_IMG.orig" |
146 | 85 | + _cleanup_test_img | |
147 | TEST_OFFSETS="0 4294967296" | 86 | + _rm_test_img "$TEST_IMG.base" |
148 | CLUSTER_SIZE=65536 | 87 | + _rm_test_img "$TEST_IMG.orig" |
88 | } | ||
89 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
90 | |||
149 | diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020 | 91 | diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020 |
150 | index XXXXXXX..XXXXXXX 100755 | 92 | index XXXXXXX..XXXXXXX 100755 |
151 | --- a/tests/qemu-iotests/020 | 93 | --- a/tests/qemu-iotests/020 |
152 | +++ b/tests/qemu-iotests/020 | 94 | +++ b/tests/qemu-iotests/020 |
153 | @@ -XXX,XX +XXX,XX @@ _supported_fmt qcow qcow2 vmdk qed | 95 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! |
154 | _supported_proto file | 96 | |
155 | _unsupported_imgopts "subformat=monolithicFlat" \ | 97 | _cleanup() |
156 | "subformat=twoGbMaxExtentFlat" \ | 98 | { |
157 | - "subformat=twoGbMaxExtentSparse" | 99 | - _cleanup_test_img |
158 | + "subformat=twoGbMaxExtentSparse" \ | 100 | - rm -f "$TEST_IMG.base" |
159 | + "subformat=streamOptimized" | 101 | - rm -f "$TEST_IMG.orig" |
160 | 102 | + _cleanup_test_img | |
161 | TEST_OFFSETS="0 4294967296" | 103 | + _rm_test_img "$TEST_IMG.base" |
162 | 104 | + _rm_test_img "$TEST_IMG.orig" | |
163 | diff --git a/tests/qemu-iotests/027 b/tests/qemu-iotests/027 | 105 | } |
164 | index XXXXXXX..XXXXXXX 100755 | 106 | trap "_cleanup; exit \$status" 0 1 2 3 15 |
165 | --- a/tests/qemu-iotests/027 | 107 | |
166 | +++ b/tests/qemu-iotests/027 | 108 | diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024 |
167 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | 109 | index XXXXXXX..XXXXXXX 100755 |
168 | 110 | --- a/tests/qemu-iotests/024 | |
169 | _supported_fmt vmdk qcow qcow2 qed | 111 | +++ b/tests/qemu-iotests/024 |
170 | _supported_proto generic | 112 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! |
171 | +_unsupported_imgopts "subformat=streamOptimized" | 113 | _cleanup() |
172 | 114 | { | |
173 | 115 | _cleanup_test_img | |
174 | size=128M | 116 | - rm -f "$TEST_DIR/t.$IMGFMT.base_old" |
175 | diff --git a/tests/qemu-iotests/032 b/tests/qemu-iotests/032 | 117 | - rm -f "$TEST_DIR/t.$IMGFMT.base_new" |
176 | index XXXXXXX..XXXXXXX 100755 | 118 | + _rm_test_img "$TEST_DIR/t.$IMGFMT.base_old" |
177 | --- a/tests/qemu-iotests/032 | 119 | + _rm_test_img "$TEST_DIR/t.$IMGFMT.base_new" |
178 | +++ b/tests/qemu-iotests/032 | 120 | |
179 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | 121 | - rm -f "$TEST_DIR/subdir/t.$IMGFMT" |
180 | # This works for any image format (though unlikely to segfault for raw) | 122 | - rm -f "$TEST_DIR/subdir/t.$IMGFMT.base_old" |
181 | _supported_fmt generic | 123 | - rm -f "$TEST_DIR/subdir/t.$IMGFMT.base_new" |
182 | _supported_proto generic | 124 | + _rm_test_img "$TEST_DIR/subdir/t.$IMGFMT" |
183 | +_unsupported_imgopts "subformat=streamOptimized" | 125 | + _rm_test_img "$TEST_DIR/subdir/t.$IMGFMT.base_old" |
184 | 126 | + _rm_test_img "$TEST_DIR/subdir/t.$IMGFMT.base_new" | |
185 | echo | 127 | rmdir "$TEST_DIR/subdir" 2> /dev/null |
186 | echo === Prepare image === | 128 | } |
187 | diff --git a/tests/qemu-iotests/033 b/tests/qemu-iotests/033 | 129 | trap "_cleanup; exit \$status" 0 1 2 3 15 |
188 | index XXXXXXX..XXXXXXX 100755 | 130 | diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028 |
189 | --- a/tests/qemu-iotests/033 | 131 | index XXXXXXX..XXXXXXX 100755 |
190 | +++ b/tests/qemu-iotests/033 | 132 | --- a/tests/qemu-iotests/028 |
191 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | 133 | +++ b/tests/qemu-iotests/028 |
192 | 134 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | |
193 | _supported_fmt generic | 135 | _cleanup() |
194 | _supported_proto generic | 136 | { |
195 | +_unsupported_imgopts "subformat=streamOptimized" | 137 | _cleanup_qemu |
196 | 138 | - rm -f "${TEST_IMG}.copy" | |
197 | 139 | + _rm_test_img "${TEST_IMG}.copy" | |
198 | size=128M | 140 | _cleanup_test_img |
199 | diff --git a/tests/qemu-iotests/034 b/tests/qemu-iotests/034 | 141 | } |
200 | index XXXXXXX..XXXXXXX 100755 | 142 | trap "_cleanup; exit \$status" 0 1 2 3 15 |
201 | --- a/tests/qemu-iotests/034 | 143 | diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029 |
202 | +++ b/tests/qemu-iotests/034 | 144 | index XXXXXXX..XXXXXXX 100755 |
203 | @@ -XXX,XX +XXX,XX @@ _supported_proto file | 145 | --- a/tests/qemu-iotests/029 |
204 | _supported_os Linux | 146 | +++ b/tests/qemu-iotests/029 |
205 | _unsupported_imgopts "subformat=monolithicFlat" \ | 147 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! |
206 | "subformat=twoGbMaxExtentFlat" \ | 148 | |
207 | - "subformat=twoGbMaxExtentSparse" | 149 | _cleanup() |
208 | + "subformat=twoGbMaxExtentSparse" \ | 150 | { |
209 | + "subformat=streamOptimized" | 151 | - rm -f $TEST_IMG.snap |
210 | 152 | + _rm_test_img "$TEST_IMG.snap" | |
211 | CLUSTER_SIZE=4k | 153 | _cleanup_test_img |
212 | size=128M | 154 | } |
213 | diff --git a/tests/qemu-iotests/037 b/tests/qemu-iotests/037 | 155 | trap "_cleanup; exit \$status" 0 1 2 3 15 |
214 | index XXXXXXX..XXXXXXX 100755 | 156 | diff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043 |
215 | --- a/tests/qemu-iotests/037 | 157 | index XXXXXXX..XXXXXXX 100755 |
216 | +++ b/tests/qemu-iotests/037 | 158 | --- a/tests/qemu-iotests/043 |
217 | @@ -XXX,XX +XXX,XX @@ _supported_fmt qcow qcow2 vmdk qed | 159 | +++ b/tests/qemu-iotests/043 |
218 | _supported_proto file | 160 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! |
219 | _unsupported_imgopts "subformat=monolithicFlat" \ | 161 | _cleanup() |
220 | "subformat=twoGbMaxExtentFlat" \ | 162 | { |
221 | - "subformat=twoGbMaxExtentSparse" | 163 | _cleanup_test_img |
222 | + "subformat=twoGbMaxExtentSparse" \ | 164 | - rm -f "$TEST_IMG".[123].base |
223 | + "subformat=streamOptimized" | 165 | + for img in "$TEST_IMG".[123].base; do |
224 | 166 | + _rm_test_img "$img" | |
225 | CLUSTER_SIZE=4k | 167 | + done |
226 | size=128M | 168 | } |
169 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
170 | |||
171 | diff --git a/tests/qemu-iotests/048 b/tests/qemu-iotests/048 | ||
172 | index XXXXXXX..XXXXXXX 100755 | ||
173 | --- a/tests/qemu-iotests/048 | ||
174 | +++ b/tests/qemu-iotests/048 | ||
175 | @@ -XXX,XX +XXX,XX @@ _cleanup() | ||
176 | { | ||
177 | echo "Cleanup" | ||
178 | _cleanup_test_img | ||
179 | - rm "${TEST_IMG_FILE2}" | ||
180 | + _rm_test_img "${TEST_IMG_FILE2}" | ||
181 | } | ||
182 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
183 | |||
184 | diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050 | ||
185 | index XXXXXXX..XXXXXXX 100755 | ||
186 | --- a/tests/qemu-iotests/050 | ||
187 | +++ b/tests/qemu-iotests/050 | ||
188 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
189 | _cleanup() | ||
190 | { | ||
191 | _cleanup_test_img | ||
192 | - rm -f "$TEST_IMG.old" | ||
193 | - rm -f "$TEST_IMG.new" | ||
194 | + _rm_test_img "$TEST_IMG.old" | ||
195 | + _rm_test_img "$TEST_IMG.new" | ||
196 | } | ||
197 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
198 | |||
199 | diff --git a/tests/qemu-iotests/053 b/tests/qemu-iotests/053 | ||
200 | index XXXXXXX..XXXXXXX 100755 | ||
201 | --- a/tests/qemu-iotests/053 | ||
202 | +++ b/tests/qemu-iotests/053 | ||
203 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
204 | |||
205 | _cleanup() | ||
206 | { | ||
207 | - rm -f "$TEST_IMG.orig" | ||
208 | - _cleanup_test_img | ||
209 | + _rm_test_img "$TEST_IMG.orig" | ||
210 | + _cleanup_test_img | ||
211 | } | ||
212 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
213 | |||
214 | diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058 | ||
215 | index XXXXXXX..XXXXXXX 100755 | ||
216 | --- a/tests/qemu-iotests/058 | ||
217 | +++ b/tests/qemu-iotests/058 | ||
218 | @@ -XXX,XX +XXX,XX @@ _cleanup() | ||
219 | { | ||
220 | nbd_server_stop | ||
221 | _cleanup_test_img | ||
222 | - rm -f "$converted_image" | ||
223 | + _rm_test_img "$converted_image" | ||
224 | } | ||
225 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
226 | |||
227 | diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059 | ||
228 | index XXXXXXX..XXXXXXX 100755 | ||
229 | --- a/tests/qemu-iotests/059 | ||
230 | +++ b/tests/qemu-iotests/059 | ||
231 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
232 | _cleanup() | ||
233 | { | ||
234 | _cleanup_test_img | ||
235 | - rm -f "$TEST_IMG.qcow2" | ||
236 | + IMGFMT=qcow2 _rm_test_img "$TEST_IMG.qcow2" | ||
237 | } | ||
238 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
239 | |||
240 | diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061 | ||
241 | index XXXXXXX..XXXXXXX 100755 | ||
242 | --- a/tests/qemu-iotests/061 | ||
243 | +++ b/tests/qemu-iotests/061 | ||
244 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
245 | _cleanup() | ||
246 | { | ||
247 | _cleanup_test_img | ||
248 | - rm -f $TEST_IMG.data | ||
249 | + _rm_test_img "$TEST_IMG.data" | ||
250 | } | ||
251 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
252 | |||
227 | diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063 | 253 | diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063 |
228 | index XXXXXXX..XXXXXXX 100755 | 254 | index XXXXXXX..XXXXXXX 100755 |
229 | --- a/tests/qemu-iotests/063 | 255 | --- a/tests/qemu-iotests/063 |
230 | +++ b/tests/qemu-iotests/063 | 256 | +++ b/tests/qemu-iotests/063 |
231 | @@ -XXX,XX +XXX,XX @@ _supported_fmt qcow qcow2 vmdk qed raw | 257 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! |
232 | _supported_proto file | 258 | |
233 | _unsupported_imgopts "subformat=monolithicFlat" \ | 259 | _cleanup() |
234 | "subformat=twoGbMaxExtentFlat" \ | 260 | { |
235 | - "subformat=twoGbMaxExtentSparse" | 261 | - _cleanup_test_img |
236 | + "subformat=twoGbMaxExtentSparse" \ | 262 | - rm -f "$TEST_IMG.orig" "$TEST_IMG.raw1" "$TEST_IMG.raw2" |
237 | + "subformat=streamOptimized" | 263 | + _cleanup_test_img |
238 | 264 | + for img in "$TEST_IMG".{orig,raw1,raw2,target}; do | |
239 | _make_test_img 4M | 265 | + _rm_test_img "$img" |
240 | 266 | + done | |
241 | diff --git a/tests/qemu-iotests/072 b/tests/qemu-iotests/072 | 267 | } |
242 | index XXXXXXX..XXXXXXX 100755 | 268 | trap "_cleanup; exit \$status" 0 1 2 3 15 |
243 | --- a/tests/qemu-iotests/072 | 269 | |
244 | +++ b/tests/qemu-iotests/072 | 270 | diff --git a/tests/qemu-iotests/069 b/tests/qemu-iotests/069 |
245 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | 271 | index XXXXXXX..XXXXXXX 100755 |
246 | 272 | --- a/tests/qemu-iotests/069 | |
247 | _supported_fmt vpc vmdk vhdx vdi qed qcow2 qcow | 273 | +++ b/tests/qemu-iotests/069 |
248 | _supported_proto file | 274 | @@ -XXX,XX +XXX,XX @@ echo "=== Creating an image with a backing file and deleting that file ===" |
249 | +_unsupported_imgopts "subformat=streamOptimized" | ||
250 | |||
251 | IMG_SIZE=64M | ||
252 | |||
253 | diff --git a/tests/qemu-iotests/105 b/tests/qemu-iotests/105 | ||
254 | index XXXXXXX..XXXXXXX 100755 | ||
255 | --- a/tests/qemu-iotests/105 | ||
256 | +++ b/tests/qemu-iotests/105 | ||
257 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
258 | _supported_fmt qcow2 vmdk vhdx qed | ||
259 | _supported_proto generic | ||
260 | _unsupported_imgopts "subformat=twoGbMaxExtentFlat" \ | ||
261 | - "subformat=twoGbMaxExtentSparse" | ||
262 | + "subformat=twoGbMaxExtentSparse" \ | ||
263 | + "subformat=streamOptimized" | ||
264 | |||
265 | echo | 275 | echo |
266 | echo "creating large image" | 276 | TEST_IMG="$TEST_IMG.base" _make_test_img $IMG_SIZE |
277 | _make_test_img -b "$TEST_IMG.base" $IMG_SIZE | ||
278 | -rm -f "$TEST_IMG.base" | ||
279 | +_rm_test_img "$TEST_IMG.base" | ||
280 | # Just open the image and close it right again (this should print an error message) | ||
281 | $QEMU_IO -c quit "$TEST_IMG" 2>&1 | _filter_testdir | _filter_imgfmt | ||
282 | |||
283 | diff --git a/tests/qemu-iotests/074 b/tests/qemu-iotests/074 | ||
284 | index XXXXXXX..XXXXXXX 100755 | ||
285 | --- a/tests/qemu-iotests/074 | ||
286 | +++ b/tests/qemu-iotests/074 | ||
287 | @@ -XXX,XX +XXX,XX @@ _cleanup() | ||
288 | { | ||
289 | echo "Cleanup" | ||
290 | _cleanup_test_img | ||
291 | - rm "${TEST_IMG2}" | ||
292 | + _rm_test_img "${TEST_IMG2}" | ||
293 | rm -f "$TEST_DIR/blkdebug.conf" | ||
294 | } | ||
295 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
296 | diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080 | ||
297 | index XXXXXXX..XXXXXXX 100755 | ||
298 | --- a/tests/qemu-iotests/080 | ||
299 | +++ b/tests/qemu-iotests/080 | ||
300 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
301 | |||
302 | _cleanup() | ||
303 | { | ||
304 | - rm -f $TEST_IMG.snap | ||
305 | + _rm_test_img "$TEST_IMG.snap" | ||
306 | _cleanup_test_img | ||
307 | } | ||
308 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
309 | diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081 | ||
310 | index XXXXXXX..XXXXXXX 100755 | ||
311 | --- a/tests/qemu-iotests/081 | ||
312 | +++ b/tests/qemu-iotests/081 | ||
313 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
314 | |||
315 | _cleanup() | ||
316 | { | ||
317 | - rm -rf $TEST_DIR/1.raw | ||
318 | - rm -rf $TEST_DIR/2.raw | ||
319 | - rm -rf $TEST_DIR/3.raw | ||
320 | + _rm_test_img "$TEST_DIR/1.raw" | ||
321 | + _rm_test_img "$TEST_DIR/2.raw" | ||
322 | + _rm_test_img "$TEST_DIR/3.raw" | ||
323 | } | ||
324 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
325 | |||
326 | diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085 | ||
327 | index XXXXXXX..XXXXXXX 100755 | ||
328 | --- a/tests/qemu-iotests/085 | ||
329 | +++ b/tests/qemu-iotests/085 | ||
330 | @@ -XXX,XX +XXX,XX @@ _cleanup() | ||
331 | _cleanup_qemu | ||
332 | for i in $(seq 1 ${SNAPSHOTS}) | ||
333 | do | ||
334 | - rm -f "${TEST_DIR}/${i}-${snapshot_virt0}" | ||
335 | - rm -f "${TEST_DIR}/${i}-${snapshot_virt1}" | ||
336 | + _rm_test_img "${TEST_DIR}/${i}-${snapshot_virt0}" | ||
337 | + _rm_test_img "${TEST_DIR}/${i}-${snapshot_virt1}" | ||
338 | + done | ||
339 | + for img in "${TEST_IMG}".{1,2,base} | ||
340 | + do | ||
341 | + _rm_test_img "$img" | ||
342 | done | ||
343 | - rm -f "${TEST_IMG}" "${TEST_IMG}.1" "${TEST_IMG}.2" "${TEST_IMG}.base" | ||
344 | |||
345 | } | ||
346 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
347 | diff --git a/tests/qemu-iotests/088 b/tests/qemu-iotests/088 | ||
348 | index XXXXXXX..XXXXXXX 100755 | ||
349 | --- a/tests/qemu-iotests/088 | ||
350 | +++ b/tests/qemu-iotests/088 | ||
351 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
352 | |||
353 | _cleanup() | ||
354 | { | ||
355 | - rm -f $TEST_IMG.snap | ||
356 | + _rm_test_img "$TEST_IMG.snap" | ||
357 | _cleanup_test_img | ||
358 | } | ||
359 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
360 | diff --git a/tests/qemu-iotests/092 b/tests/qemu-iotests/092 | ||
361 | index XXXXXXX..XXXXXXX 100755 | ||
362 | --- a/tests/qemu-iotests/092 | ||
363 | +++ b/tests/qemu-iotests/092 | ||
364 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
365 | |||
366 | _cleanup() | ||
367 | { | ||
368 | - rm -f $TEST_IMG.snap | ||
369 | + _rm_test_img "$TEST_IMG.snap" | ||
370 | _cleanup_test_img | ||
371 | } | ||
372 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
373 | diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094 | ||
374 | index XXXXXXX..XXXXXXX 100755 | ||
375 | --- a/tests/qemu-iotests/094 | ||
376 | +++ b/tests/qemu-iotests/094 | ||
377 | @@ -XXX,XX +XXX,XX @@ _cleanup() | ||
378 | { | ||
379 | _cleanup_qemu | ||
380 | _cleanup_test_img | ||
381 | - rm -f "$TEST_DIR/source.$IMGFMT" | ||
382 | + _rm_test_img "$TEST_DIR/source.$IMGFMT" | ||
383 | } | ||
384 | |||
385 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
386 | diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095 | ||
387 | index XXXXXXX..XXXXXXX 100755 | ||
388 | --- a/tests/qemu-iotests/095 | ||
389 | +++ b/tests/qemu-iotests/095 | ||
390 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
391 | _cleanup() | ||
392 | { | ||
393 | _cleanup_qemu | ||
394 | - rm -f "${TEST_IMG}.base" "${TEST_IMG}.snp1" | ||
395 | - _cleanup_test_img | ||
396 | + _rm_test_img "${TEST_IMG}.base" | ||
397 | + _rm_test_img "${TEST_IMG}.snp1" | ||
398 | + _cleanup_test_img | ||
399 | } | ||
400 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
401 | |||
402 | diff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099 | ||
403 | index XXXXXXX..XXXXXXX 100755 | ||
404 | --- a/tests/qemu-iotests/099 | ||
405 | +++ b/tests/qemu-iotests/099 | ||
406 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
407 | |||
408 | _cleanup() | ||
409 | { | ||
410 | - _cleanup_test_img | ||
411 | + _cleanup_test_img | ||
412 | + _rm_test_img "$TEST_IMG.compare" | ||
413 | + rm -f "$TEST_DIR/blkdebug.conf" | ||
414 | + | ||
415 | } | ||
416 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
417 | |||
418 | @@ -XXX,XX +XXX,XX @@ echo | ||
419 | test_qemu "file.driver=blkdebug,file.image.filename=$TEST_IMG" | ||
420 | |||
421 | |||
422 | -rm -f "$TEST_IMG.compare" "$TEST_DIR/blkdebug.conf" | ||
423 | - | ||
424 | # success, all done | ||
425 | echo "*** done" | ||
426 | rm -f $seq.full | ||
427 | diff --git a/tests/qemu-iotests/109 b/tests/qemu-iotests/109 | ||
428 | index XXXXXXX..XXXXXXX 100755 | ||
429 | --- a/tests/qemu-iotests/109 | ||
430 | +++ b/tests/qemu-iotests/109 | ||
431 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
432 | _cleanup() | ||
433 | { | ||
434 | _cleanup_qemu | ||
435 | - rm -f $TEST_IMG.src | ||
436 | - _cleanup_test_img | ||
437 | + _rm_test_img "$TEST_IMG.src" | ||
438 | + _cleanup_test_img | ||
439 | } | ||
440 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
441 | |||
442 | diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110 | ||
443 | index XXXXXXX..XXXXXXX 100755 | ||
444 | --- a/tests/qemu-iotests/110 | ||
445 | +++ b/tests/qemu-iotests/110 | ||
446 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
447 | |||
448 | _cleanup() | ||
449 | { | ||
450 | - _cleanup_test_img | ||
451 | - rm -f "$TEST_IMG.copy" | ||
452 | + _cleanup_test_img | ||
453 | + _rm_test_img "$TEST_IMG.copy" | ||
454 | } | ||
455 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
456 | |||
457 | diff --git a/tests/qemu-iotests/122 b/tests/qemu-iotests/122 | ||
458 | index XXXXXXX..XXXXXXX 100755 | ||
459 | --- a/tests/qemu-iotests/122 | ||
460 | +++ b/tests/qemu-iotests/122 | ||
461 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
462 | |||
463 | _cleanup() | ||
464 | { | ||
465 | - rm -f "$TEST_IMG".[123] | ||
466 | - _cleanup_test_img | ||
467 | + for img in "$TEST_IMG".[123]; do | ||
468 | + _rm_test_img "$img" | ||
469 | + done | ||
470 | + _cleanup_test_img | ||
471 | } | ||
472 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
473 | |||
474 | diff --git a/tests/qemu-iotests/123 b/tests/qemu-iotests/123 | ||
475 | index XXXXXXX..XXXXXXX 100755 | ||
476 | --- a/tests/qemu-iotests/123 | ||
477 | +++ b/tests/qemu-iotests/123 | ||
478 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
479 | _cleanup() | ||
480 | { | ||
481 | _cleanup_test_img | ||
482 | - rm -f "$SRC_IMG" | ||
483 | + _rm_test_img "$SRC_IMG" | ||
484 | } | ||
485 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
486 | |||
487 | diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141 | ||
488 | index XXXXXXX..XXXXXXX 100755 | ||
489 | --- a/tests/qemu-iotests/141 | ||
490 | +++ b/tests/qemu-iotests/141 | ||
491 | @@ -XXX,XX +XXX,XX @@ _cleanup() | ||
492 | { | ||
493 | _cleanup_qemu | ||
494 | _cleanup_test_img | ||
495 | - rm -f "$TEST_DIR"/{b,m,o}.$IMGFMT | ||
496 | + for img in "$TEST_DIR"/{b,m,o}.$IMGFMT; do | ||
497 | + _rm_test_img "$img" | ||
498 | + done | ||
499 | } | ||
500 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
501 | |||
502 | diff --git a/tests/qemu-iotests/142 b/tests/qemu-iotests/142 | ||
503 | index XXXXXXX..XXXXXXX 100755 | ||
504 | --- a/tests/qemu-iotests/142 | ||
505 | +++ b/tests/qemu-iotests/142 | ||
506 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
507 | _cleanup() | ||
508 | { | ||
509 | _cleanup_test_img | ||
510 | - rm -f $TEST_IMG.snap | ||
511 | + _rm_test_img "$TEST_IMG.snap" | ||
512 | } | ||
513 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
514 | |||
515 | diff --git a/tests/qemu-iotests/144 b/tests/qemu-iotests/144 | ||
516 | index XXXXXXX..XXXXXXX 100755 | ||
517 | --- a/tests/qemu-iotests/144 | ||
518 | +++ b/tests/qemu-iotests/144 | ||
519 | @@ -XXX,XX +XXX,XX @@ TMP_SNAP2=${TEST_DIR}/tmp2.qcow2 | ||
520 | _cleanup() | ||
521 | { | ||
522 | _cleanup_qemu | ||
523 | - rm -f "${TEST_IMG}" "${TMP_SNAP1}" "${TMP_SNAP2}" | ||
524 | + for img in "${TEST_IMG}" "${TMP_SNAP1}" "${TMP_SNAP2}"; do | ||
525 | + _rm_test_img "$img" | ||
526 | + done | ||
527 | } | ||
528 | |||
529 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
530 | diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153 | ||
531 | index XXXXXXX..XXXXXXX 100755 | ||
532 | --- a/tests/qemu-iotests/153 | ||
533 | +++ b/tests/qemu-iotests/153 | ||
534 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
535 | _cleanup() | ||
536 | { | ||
537 | _cleanup_test_img | ||
538 | - rm -f "${TEST_IMG}.base" | ||
539 | - rm -f "${TEST_IMG}.overlay" | ||
540 | - rm -f "${TEST_IMG}.convert" | ||
541 | - rm -f "${TEST_IMG}.a" | ||
542 | - rm -f "${TEST_IMG}.b" | ||
543 | - rm -f "${TEST_IMG}.c" | ||
544 | - rm -f "${TEST_IMG}.lnk" | ||
545 | + for img in "${TEST_IMG}".{base,overlay,convert,a,b,c,lnk}; do | ||
546 | + _rm_test_img "$img" | ||
547 | + done | ||
548 | } | ||
549 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
550 | |||
551 | diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156 | ||
552 | index XXXXXXX..XXXXXXX 100755 | ||
553 | --- a/tests/qemu-iotests/156 | ||
554 | +++ b/tests/qemu-iotests/156 | ||
555 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
556 | _cleanup() | ||
557 | { | ||
558 | _cleanup_qemu | ||
559 | - rm -f "$TEST_IMG"{,.target}{,.backing,.overlay} | ||
560 | + for img in "$TEST_IMG"{,.target}{,.backing,.overlay}; do | ||
561 | + _rm_test_img "$img" | ||
562 | + done | ||
563 | } | ||
564 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
565 | |||
566 | @@ -XXX,XX +XXX,XX @@ _send_qemu_cmd $QEMU_HANDLE \ | ||
567 | '"status": "null"' | ||
568 | |||
569 | # Remove the source images | ||
570 | -rm -f "$TEST_IMG{,.backing,.overlay}" | ||
571 | +for img in "$TEST_IMG{,.backing,.overlay}"; do | ||
572 | + _rm_test_img "$img" | ||
573 | +done | ||
574 | |||
575 | echo | ||
576 | |||
577 | diff --git a/tests/qemu-iotests/159 b/tests/qemu-iotests/159 | ||
578 | index XXXXXXX..XXXXXXX 100755 | ||
579 | --- a/tests/qemu-iotests/159 | ||
580 | +++ b/tests/qemu-iotests/159 | ||
581 | @@ -XXX,XX +XXX,XX @@ status=1 | ||
582 | _cleanup() | ||
583 | { | ||
584 | _cleanup_test_img | ||
585 | - rm -f "$TEST_IMG.out" | ||
586 | + _rm_test_img "$TEST_IMG.out" | ||
587 | } | ||
588 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
589 | |||
590 | diff --git a/tests/qemu-iotests/160 b/tests/qemu-iotests/160 | ||
591 | index XXXXXXX..XXXXXXX 100755 | ||
592 | --- a/tests/qemu-iotests/160 | ||
593 | +++ b/tests/qemu-iotests/160 | ||
594 | @@ -XXX,XX +XXX,XX @@ status=1 | ||
595 | _cleanup() | ||
596 | { | ||
597 | _cleanup_test_img | ||
598 | - rm -f "$TEST_IMG.out" "$TEST_IMG.out.dd" | ||
599 | + _rm_test_img "$TEST_IMG.out" | ||
600 | + _rm_test_img "$TEST_IMG.out.dd" | ||
601 | } | ||
602 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
603 | |||
604 | diff --git a/tests/qemu-iotests/161 b/tests/qemu-iotests/161 | ||
605 | index XXXXXXX..XXXXXXX 100755 | ||
606 | --- a/tests/qemu-iotests/161 | ||
607 | +++ b/tests/qemu-iotests/161 | ||
608 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
609 | _cleanup() | ||
610 | { | ||
611 | _cleanup_test_img | ||
612 | - rm -f "$TEST_IMG.base" | ||
613 | - rm -f "$TEST_IMG.int" | ||
614 | + _rm_test_img "$TEST_IMG.base" | ||
615 | + _rm_test_img "$TEST_IMG.int" | ||
616 | } | ||
617 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
618 | |||
619 | diff --git a/tests/qemu-iotests/170 b/tests/qemu-iotests/170 | ||
620 | index XXXXXXX..XXXXXXX 100755 | ||
621 | --- a/tests/qemu-iotests/170 | ||
622 | +++ b/tests/qemu-iotests/170 | ||
623 | @@ -XXX,XX +XXX,XX @@ status=1 | ||
624 | _cleanup() | ||
625 | { | ||
626 | _cleanup_test_img | ||
627 | - rm -f "$TEST_IMG.out" | ||
628 | + _rm_test_img "$TEST_IMG.out" | ||
629 | } | ||
630 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
631 | |||
632 | diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172 | ||
633 | index XXXXXXX..XXXXXXX 100755 | ||
634 | --- a/tests/qemu-iotests/172 | ||
635 | +++ b/tests/qemu-iotests/172 | ||
636 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
637 | |||
638 | _cleanup() | ||
639 | { | ||
640 | - _cleanup_test_img | ||
641 | - rm -f "$TEST_IMG.2" | ||
642 | - rm -f "$TEST_IMG.3" | ||
643 | + _cleanup_test_img | ||
644 | + _rm_test_img "$TEST_IMG.2" | ||
645 | + _rm_test_img "$TEST_IMG.3" | ||
646 | } | ||
647 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
648 | |||
649 | diff --git a/tests/qemu-iotests/173 b/tests/qemu-iotests/173 | ||
650 | index XXXXXXX..XXXXXXX 100755 | ||
651 | --- a/tests/qemu-iotests/173 | ||
652 | +++ b/tests/qemu-iotests/173 | ||
653 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
654 | _cleanup() | ||
655 | { | ||
656 | _cleanup_qemu | ||
657 | - rm -f "${QEMU_TEST_DIR}/image.base" "${QEMU_TEST_DIR}/image.snp1" | ||
658 | + _rm_test_img "${TEST_DIR}/image.base" | ||
659 | + _rm_test_img "${TEST_DIR}/image.snp1" | ||
660 | _cleanup_test_img | ||
661 | } | ||
662 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
663 | diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178 | ||
664 | index XXXXXXX..XXXXXXX 100755 | ||
665 | --- a/tests/qemu-iotests/178 | ||
666 | +++ b/tests/qemu-iotests/178 | ||
667 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
668 | _cleanup() | ||
669 | { | ||
670 | _cleanup_test_img | ||
671 | - rm -f "$TEST_IMG.converted" | ||
672 | + _rm_test_img "$TEST_IMG.converted" | ||
673 | } | ||
674 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
675 | |||
676 | diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182 | ||
677 | index XXXXXXX..XXXXXXX 100755 | ||
678 | --- a/tests/qemu-iotests/182 | ||
679 | +++ b/tests/qemu-iotests/182 | ||
680 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
681 | _cleanup() | ||
682 | { | ||
683 | _cleanup_test_img | ||
684 | - rm -f "$TEST_IMG.overlay" | ||
685 | + _rm_test_img "$TEST_IMG.overlay" | ||
686 | rm -f "$SOCK_DIR/nbd.socket" | ||
687 | } | ||
688 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
689 | diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183 | ||
690 | index XXXXXXX..XXXXXXX 100755 | ||
691 | --- a/tests/qemu-iotests/183 | ||
692 | +++ b/tests/qemu-iotests/183 | ||
693 | @@ -XXX,XX +XXX,XX @@ MIG_SOCKET="${SOCK_DIR}/migrate" | ||
694 | _cleanup() | ||
695 | { | ||
696 | rm -f "${MIG_SOCKET}" | ||
697 | - rm -f "${TEST_IMG}.dest" | ||
698 | + _rm_test_img "${TEST_IMG}.dest" | ||
699 | _cleanup_test_img | ||
700 | _cleanup_qemu | ||
701 | } | ||
702 | diff --git a/tests/qemu-iotests/185 b/tests/qemu-iotests/185 | ||
703 | index XXXXXXX..XXXXXXX 100755 | ||
704 | --- a/tests/qemu-iotests/185 | ||
705 | +++ b/tests/qemu-iotests/185 | ||
706 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
707 | |||
708 | _cleanup() | ||
709 | { | ||
710 | - rm -f "${TEST_IMG}.mid" | ||
711 | - rm -f "${TEST_IMG}.copy" | ||
712 | + _rm_test_img "${TEST_IMG}.mid" | ||
713 | + _rm_test_img "${TEST_IMG}.copy" | ||
714 | _cleanup_test_img | ||
715 | _cleanup_qemu | ||
716 | } | ||
717 | diff --git a/tests/qemu-iotests/187 b/tests/qemu-iotests/187 | ||
718 | index XXXXXXX..XXXXXXX 100755 | ||
719 | --- a/tests/qemu-iotests/187 | ||
720 | +++ b/tests/qemu-iotests/187 | ||
721 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
722 | |||
723 | _cleanup() | ||
724 | { | ||
725 | - _cleanup_test_img | ||
726 | - rm -f "$TEST_IMG.2" | ||
727 | - rm -f "$TEST_IMG.3" | ||
728 | + _cleanup_test_img | ||
729 | + _rm_test_img "$TEST_IMG.2" | ||
730 | + _rm_test_img "$TEST_IMG.3" | ||
731 | } | ||
732 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
733 | |||
734 | diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190 | ||
735 | index XXXXXXX..XXXXXXX 100755 | ||
736 | --- a/tests/qemu-iotests/190 | ||
737 | +++ b/tests/qemu-iotests/190 | ||
738 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
739 | _cleanup() | ||
740 | { | ||
741 | _cleanup_test_img | ||
742 | - rm -f "$TEST_IMG.converted" | ||
743 | + _rm_test_img "$TEST_IMG.converted" | ||
744 | } | ||
745 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
746 | |||
747 | diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191 | ||
748 | index XXXXXXX..XXXXXXX 100755 | ||
749 | --- a/tests/qemu-iotests/191 | ||
750 | +++ b/tests/qemu-iotests/191 | ||
751 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
752 | |||
753 | _cleanup() | ||
754 | { | ||
755 | - rm -f "${TEST_IMG}.mid" | ||
756 | - rm -f "${TEST_IMG}.ovl2" | ||
757 | - rm -f "${TEST_IMG}.ovl3" | ||
758 | + _rm_test_img "${TEST_IMG}.mid" | ||
759 | + _rm_test_img "${TEST_IMG}.ovl2" | ||
760 | + _rm_test_img "${TEST_IMG}.ovl3" | ||
761 | _cleanup_test_img | ||
762 | _cleanup_qemu | ||
763 | } | ||
764 | diff --git a/tests/qemu-iotests/195 b/tests/qemu-iotests/195 | ||
765 | index XXXXXXX..XXXXXXX 100755 | ||
766 | --- a/tests/qemu-iotests/195 | ||
767 | +++ b/tests/qemu-iotests/195 | ||
768 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
769 | _cleanup() | ||
770 | { | ||
771 | _cleanup_test_img | ||
772 | - rm -f "$TEST_IMG.mid" | ||
773 | + _rm_test_img "$TEST_IMG.mid" | ||
774 | } | ||
775 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
776 | |||
267 | diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197 | 777 | diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197 |
268 | index XXXXXXX..XXXXXXX 100755 | 778 | index XXXXXXX..XXXXXXX 100755 |
269 | --- a/tests/qemu-iotests/197 | 779 | --- a/tests/qemu-iotests/197 |
270 | +++ b/tests/qemu-iotests/197 | 780 | +++ b/tests/qemu-iotests/197 |
271 | @@ -XXX,XX +XXX,XX @@ _supported_fmt generic | 781 | @@ -XXX,XX +XXX,XX @@ esac |
272 | _supported_proto generic | 782 | _cleanup() |
273 | # LUKS support may be possible, but it complicates things. | 783 | { |
274 | _unsupported_fmt luks | 784 | _cleanup_test_img |
275 | +_unsupported_imgopts "subformat=streamOptimized" | 785 | - rm -f "$TEST_WRAP" |
276 | 786 | + _rm_test_img "$TEST_WRAP" | |
277 | echo | 787 | rm -f "$BLKDBG_CONF" |
278 | echo '=== Copy-on-read ===' | 788 | } |
789 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
790 | diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200 | ||
791 | index XXXXXXX..XXXXXXX 100755 | ||
792 | --- a/tests/qemu-iotests/200 | ||
793 | +++ b/tests/qemu-iotests/200 | ||
794 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
795 | _cleanup() | ||
796 | { | ||
797 | _cleanup_qemu | ||
798 | - rm -f "${TEST_IMG}" "${BACKING_IMG}" | ||
799 | + _rm_test_img "${TEST_IMG}" | ||
800 | + _rm_test_img "${BACKING_IMG}" | ||
801 | } | ||
802 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
803 | |||
279 | diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215 | 804 | diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215 |
280 | index XXXXXXX..XXXXXXX 100755 | 805 | index XXXXXXX..XXXXXXX 100755 |
281 | --- a/tests/qemu-iotests/215 | 806 | --- a/tests/qemu-iotests/215 |
282 | +++ b/tests/qemu-iotests/215 | 807 | +++ b/tests/qemu-iotests/215 |
283 | @@ -XXX,XX +XXX,XX @@ _supported_fmt generic | 808 | @@ -XXX,XX +XXX,XX @@ esac |
284 | _supported_proto generic | 809 | _cleanup() |
285 | # LUKS support may be possible, but it complicates things. | 810 | { |
286 | _unsupported_fmt luks | 811 | _cleanup_test_img |
287 | +_unsupported_imgopts "subformat=streamOptimized" | 812 | - rm -f "$TEST_WRAP" |
288 | 813 | + _rm_test_img "$TEST_WRAP" | |
289 | echo | 814 | rm -f "$BLKDBG_CONF" |
290 | echo '=== Copy-on-read ===' | 815 | } |
291 | diff --git a/tests/qemu-iotests/251 b/tests/qemu-iotests/251 | 816 | trap "_cleanup; exit \$status" 0 1 2 3 15 |
292 | index XXXXXXX..XXXXXXX 100755 | 817 | diff --git a/tests/qemu-iotests/225 b/tests/qemu-iotests/225 |
293 | --- a/tests/qemu-iotests/251 | 818 | index XXXXXXX..XXXXXXX 100755 |
294 | +++ b/tests/qemu-iotests/251 | 819 | --- a/tests/qemu-iotests/225 |
295 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | 820 | +++ b/tests/qemu-iotests/225 |
296 | _supported_fmt generic | 821 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! |
297 | _supported_proto file | 822 | _cleanup() |
298 | _supported_os Linux | 823 | { |
299 | +_unsupported_imgopts "subformat=streamOptimized" | 824 | _cleanup_test_img |
300 | 825 | - rm -f "$TEST_IMG.not_base" | |
301 | if [ "$IMGOPTSSYNTAX" = "true" ]; then | 826 | + _rm_test_img "$TEST_IMG.not_base" |
302 | # We use json:{} filenames here, so we cannot work with additional options. | 827 | } |
828 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
829 | |||
830 | diff --git a/tests/qemu-iotests/229 b/tests/qemu-iotests/229 | ||
831 | index XXXXXXX..XXXXXXX 100755 | ||
832 | --- a/tests/qemu-iotests/229 | ||
833 | +++ b/tests/qemu-iotests/229 | ||
834 | @@ -XXX,XX +XXX,XX @@ _cleanup() | ||
835 | { | ||
836 | _cleanup_qemu | ||
837 | _cleanup_test_img | ||
838 | - rm -f "$TEST_IMG" "$DEST_IMG" | ||
839 | + _rm_test_img "$TEST_IMG" | ||
840 | + _rm_test_img "$DEST_IMG" | ||
841 | } | ||
842 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
843 | |||
844 | diff --git a/tests/qemu-iotests/232 b/tests/qemu-iotests/232 | ||
845 | index XXXXXXX..XXXXXXX 100755 | ||
846 | --- a/tests/qemu-iotests/232 | ||
847 | +++ b/tests/qemu-iotests/232 | ||
848 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
849 | _cleanup() | ||
850 | { | ||
851 | _cleanup_test_img | ||
852 | - rm -f $TEST_IMG.[01234] | ||
853 | + for img in "$TEST_IMG".[01234]; do | ||
854 | + _rm_test_img "$img" | ||
855 | + done | ||
856 | } | ||
857 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
858 | |||
859 | diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243 | ||
860 | index XXXXXXX..XXXXXXX 100755 | ||
861 | --- a/tests/qemu-iotests/243 | ||
862 | +++ b/tests/qemu-iotests/243 | ||
863 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
864 | _cleanup() | ||
865 | { | ||
866 | _cleanup_test_img | ||
867 | - rm -f $TEST_IMG.data | ||
868 | + _rm_test_img "$TEST_IMG.data" | ||
869 | } | ||
870 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
871 | |||
872 | diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244 | ||
873 | index XXXXXXX..XXXXXXX 100755 | ||
874 | --- a/tests/qemu-iotests/244 | ||
875 | +++ b/tests/qemu-iotests/244 | ||
876 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
877 | _cleanup() | ||
878 | { | ||
879 | _cleanup_test_img | ||
880 | - rm -f $TEST_IMG.data | ||
881 | - rm -f $TEST_IMG.src | ||
882 | + _rm_test_img "$TEST_IMG.data" | ||
883 | + _rm_test_img "$TEST_IMG.src" | ||
884 | } | ||
885 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
886 | |||
887 | diff --git a/tests/qemu-iotests/247 b/tests/qemu-iotests/247 | ||
888 | index XXXXXXX..XXXXXXX 100755 | ||
889 | --- a/tests/qemu-iotests/247 | ||
890 | +++ b/tests/qemu-iotests/247 | ||
891 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
892 | _cleanup() | ||
893 | { | ||
894 | _cleanup_test_img | ||
895 | - rm -f $TEST_IMG.[01234] | ||
896 | + for img in "$TEST_IMG".[01234]; do | ||
897 | + _rm_test_img "$img" | ||
898 | + done | ||
899 | } | ||
900 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
901 | |||
902 | diff --git a/tests/qemu-iotests/249 b/tests/qemu-iotests/249 | ||
903 | index XXXXXXX..XXXXXXX 100755 | ||
904 | --- a/tests/qemu-iotests/249 | ||
905 | +++ b/tests/qemu-iotests/249 | ||
906 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
907 | _cleanup() | ||
908 | { | ||
909 | _cleanup_test_img | ||
910 | - rm -f "$TEST_IMG.base" | ||
911 | - rm -f "$TEST_IMG.int" | ||
912 | + _rm_test_img "$TEST_IMG.base" | ||
913 | + _rm_test_img "$TEST_IMG.int" | ||
914 | } | ||
915 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
916 | |||
917 | diff --git a/tests/qemu-iotests/252 b/tests/qemu-iotests/252 | ||
918 | index XXXXXXX..XXXXXXX 100755 | ||
919 | --- a/tests/qemu-iotests/252 | ||
920 | +++ b/tests/qemu-iotests/252 | ||
921 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
922 | _cleanup() | ||
923 | { | ||
924 | _cleanup_test_img | ||
925 | - rm -f "$TEST_IMG.base_new" | ||
926 | + _rm_test_img "$TEST_IMG.base_new" | ||
927 | } | ||
928 | trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
929 | |||
303 | -- | 930 | -- |
304 | 2.21.0 | 931 | 2.24.1 |
305 | 932 | ||
306 | 933 | diff view generated by jsdifflib |
1 | This makes iotest 033 pass with e.g. subformat=monolithicFlat. It also | 1 | This will not work with external data files, so try to get tests working |
---|---|---|---|
2 | turns a former error in 059 into success. | 2 | without it as far as possible. |
3 | 3 | ||
4 | Signed-off-by: Max Reitz <mreitz@redhat.com> | 4 | Signed-off-by: Max Reitz <mreitz@redhat.com> |
5 | Message-id: 20190815153638.4600-3-mreitz@redhat.com | 5 | Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> |
6 | Reviewed-by: John Snow <jsnow@redhat.com> | 6 | Message-id: 20191107163708.833192-17-mreitz@redhat.com |
7 | Signed-off-by: Max Reitz <mreitz@redhat.com> | 7 | Signed-off-by: Max Reitz <mreitz@redhat.com> |
8 | --- | 8 | --- |
9 | block/vmdk.c | 54 ++++++++++++++++++++++++-------------- | 9 | tests/qemu-iotests/063 | 12 ++++-------- |
10 | tests/qemu-iotests/059 | 7 +++-- | 10 | tests/qemu-iotests/063.out | 3 ++- |
11 | tests/qemu-iotests/059.out | 4 ++- | 11 | tests/qemu-iotests/085 | 9 +++------ |
12 | 3 files changed, 42 insertions(+), 23 deletions(-) | 12 | tests/qemu-iotests/085.out | 8 ++++---- |
13 | 4 files changed, 13 insertions(+), 19 deletions(-) | ||
13 | 14 | ||
14 | diff --git a/block/vmdk.c b/block/vmdk.c | 15 | diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063 |
16 | index XXXXXXX..XXXXXXX 100755 | ||
17 | --- a/tests/qemu-iotests/063 | ||
18 | +++ b/tests/qemu-iotests/063 | ||
19 | @@ -XXX,XX +XXX,XX @@ _unsupported_imgopts "subformat=monolithicFlat" \ | ||
20 | _make_test_img 4M | ||
21 | |||
22 | echo "== Testing conversion with -n fails with no target file ==" | ||
23 | -# check .orig file does not exist | ||
24 | -rm -f "$TEST_IMG.orig" | ||
25 | if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.orig" >/dev/null 2>&1; then | ||
26 | exit 1 | ||
27 | fi | ||
28 | |||
29 | echo "== Testing conversion with -n succeeds with a target file ==" | ||
30 | -rm -f "$TEST_IMG.orig" | ||
31 | -cp "$TEST_IMG" "$TEST_IMG.orig" | ||
32 | +_rm_test_img "$TEST_IMG.orig" | ||
33 | +TEST_IMG="$TEST_IMG.orig" _make_test_img 4M | ||
34 | if ! $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.orig" ; then | ||
35 | exit 1 | ||
36 | fi | ||
37 | @@ -XXX,XX +XXX,XX @@ fi | ||
38 | _check_test_img | ||
39 | |||
40 | echo "== Testing conversion to a smaller file fails ==" | ||
41 | -rm -f "$TEST_IMG.orig" | ||
42 | -mv "$TEST_IMG" "$TEST_IMG.orig" | ||
43 | -_make_test_img 2M | ||
44 | -if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG.orig" "$TEST_IMG" >/dev/null 2>&1; then | ||
45 | +TEST_IMG="$TEST_IMG.target" _make_test_img 2M | ||
46 | +if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.target" >/dev/null 2>&1; then | ||
47 | exit 1 | ||
48 | fi | ||
49 | |||
50 | diff --git a/tests/qemu-iotests/063.out b/tests/qemu-iotests/063.out | ||
15 | index XXXXXXX..XXXXXXX 100644 | 51 | index XXXXXXX..XXXXXXX 100644 |
16 | --- a/block/vmdk.c | 52 | --- a/tests/qemu-iotests/063.out |
17 | +++ b/block/vmdk.c | 53 | +++ b/tests/qemu-iotests/063.out |
18 | @@ -XXX,XX +XXX,XX @@ static const char *next_line(const char *s) | 54 | @@ -XXX,XX +XXX,XX @@ QA output created by 063 |
55 | Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4194304 | ||
56 | == Testing conversion with -n fails with no target file == | ||
57 | == Testing conversion with -n succeeds with a target file == | ||
58 | +Formatting 'TEST_DIR/t.IMGFMT.orig', fmt=IMGFMT size=4194304 | ||
59 | == Testing conversion to raw is the same after conversion with -n == | ||
60 | == Testing conversion back to original format == | ||
61 | No errors were found on the image. | ||
62 | == Testing conversion to a smaller file fails == | ||
63 | -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152 | ||
64 | +Formatting 'TEST_DIR/t.IMGFMT.target', fmt=IMGFMT size=2097152 | ||
65 | == Regression testing for copy offloading bug == | ||
66 | Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 | ||
67 | Formatting 'TEST_DIR/t.IMGFMT.target', fmt=IMGFMT size=1048576 | ||
68 | diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085 | ||
69 | index XXXXXXX..XXXXXXX 100755 | ||
70 | --- a/tests/qemu-iotests/085 | ||
71 | +++ b/tests/qemu-iotests/085 | ||
72 | @@ -XXX,XX +XXX,XX @@ add_snapshot_image() | ||
73 | { | ||
74 | base_image="${TEST_DIR}/$((${1}-1))-${snapshot_virt0}" | ||
75 | snapshot_file="${TEST_DIR}/${1}-${snapshot_virt0}" | ||
76 | - _make_test_img -u -b "${base_image}" "$size" | ||
77 | - mv "${TEST_IMG}" "${snapshot_file}" | ||
78 | + TEST_IMG=$snapshot_file _make_test_img -u -b "${base_image}" "$size" | ||
79 | do_blockdev_add "$1" "'backing': null, " "${snapshot_file}" | ||
19 | } | 80 | } |
20 | 81 | ||
21 | static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, | 82 | @@ -XXX,XX +XXX,XX @@ blockdev_snapshot() |
22 | - const char *desc_file_path, QDict *options, | 83 | |
23 | - Error **errp) | 84 | size=128M |
24 | + QDict *options, Error **errp) | 85 | |
25 | { | 86 | -_make_test_img $size |
26 | int ret; | 87 | -mv "${TEST_IMG}" "${TEST_IMG}.1" |
27 | int matches; | 88 | -_make_test_img $size |
28 | @@ -XXX,XX +XXX,XX @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, | 89 | -mv "${TEST_IMG}" "${TEST_IMG}.2" |
29 | const char *p, *np; | 90 | +TEST_IMG="$TEST_IMG.1" _make_test_img $size |
30 | int64_t sectors = 0; | 91 | +TEST_IMG="$TEST_IMG.2" _make_test_img $size |
31 | int64_t flat_offset; | ||
32 | + char *desc_file_dir = NULL; | ||
33 | char *extent_path; | ||
34 | BdrvChild *extent_file; | ||
35 | BDRVVmdkState *s = bs->opaque; | ||
36 | @@ -XXX,XX +XXX,XX @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, | ||
37 | continue; | ||
38 | } | ||
39 | |||
40 | - if (!path_is_absolute(fname) && !path_has_protocol(fname) && | ||
41 | - !desc_file_path[0]) | ||
42 | - { | ||
43 | - bdrv_refresh_filename(bs->file->bs); | ||
44 | - error_setg(errp, "Cannot use relative extent paths with VMDK " | ||
45 | - "descriptor file '%s'", bs->file->bs->filename); | ||
46 | - return -EINVAL; | ||
47 | - } | ||
48 | + if (path_is_absolute(fname)) { | ||
49 | + extent_path = g_strdup(fname); | ||
50 | + } else { | ||
51 | + if (!desc_file_dir) { | ||
52 | + desc_file_dir = bdrv_dirname(bs->file->bs, errp); | ||
53 | + if (!desc_file_dir) { | ||
54 | + bdrv_refresh_filename(bs->file->bs); | ||
55 | + error_prepend(errp, "Cannot use relative paths with VMDK " | ||
56 | + "descriptor file '%s': ", | ||
57 | + bs->file->bs->filename); | ||
58 | + ret = -EINVAL; | ||
59 | + goto out; | ||
60 | + } | ||
61 | + } | ||
62 | |||
63 | - extent_path = path_combine(desc_file_path, fname); | ||
64 | + extent_path = g_strconcat(desc_file_dir, fname, NULL); | ||
65 | + } | ||
66 | |||
67 | ret = snprintf(extent_opt_prefix, 32, "extents.%d", s->num_extents); | ||
68 | assert(ret < 32); | ||
69 | @@ -XXX,XX +XXX,XX @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, | ||
70 | g_free(extent_path); | ||
71 | if (local_err) { | ||
72 | error_propagate(errp, local_err); | ||
73 | - return -EINVAL; | ||
74 | + ret = -EINVAL; | ||
75 | + goto out; | ||
76 | } | ||
77 | |||
78 | /* save to extents array */ | ||
79 | @@ -XXX,XX +XXX,XX @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, | ||
80 | 0, 0, 0, 0, 0, &extent, errp); | ||
81 | if (ret < 0) { | ||
82 | bdrv_unref_child(bs, extent_file); | ||
83 | - return ret; | ||
84 | + goto out; | ||
85 | } | ||
86 | extent->flat_start_offset = flat_offset << 9; | ||
87 | } else if (!strcmp(type, "SPARSE") || !strcmp(type, "VMFSSPARSE")) { | ||
88 | @@ -XXX,XX +XXX,XX @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, | ||
89 | g_free(buf); | ||
90 | if (ret) { | ||
91 | bdrv_unref_child(bs, extent_file); | ||
92 | - return ret; | ||
93 | + goto out; | ||
94 | } | ||
95 | extent = &s->extents[s->num_extents - 1]; | ||
96 | } else if (!strcmp(type, "SESPARSE")) { | ||
97 | ret = vmdk_open_se_sparse(bs, extent_file, bs->open_flags, errp); | ||
98 | if (ret) { | ||
99 | bdrv_unref_child(bs, extent_file); | ||
100 | - return ret; | ||
101 | + goto out; | ||
102 | } | ||
103 | extent = &s->extents[s->num_extents - 1]; | ||
104 | } else { | ||
105 | error_setg(errp, "Unsupported extent type '%s'", type); | ||
106 | bdrv_unref_child(bs, extent_file); | ||
107 | - return -ENOTSUP; | ||
108 | + ret = -ENOTSUP; | ||
109 | + goto out; | ||
110 | } | ||
111 | extent->type = g_strdup(type); | ||
112 | } | ||
113 | - return 0; | ||
114 | + | ||
115 | + ret = 0; | ||
116 | + goto out; | ||
117 | |||
118 | invalid: | ||
119 | np = next_line(p); | ||
120 | @@ -XXX,XX +XXX,XX @@ invalid: | ||
121 | np--; | ||
122 | } | ||
123 | error_setg(errp, "Invalid extent line: %.*s", (int)(np - p), p); | ||
124 | - return -EINVAL; | ||
125 | + ret = -EINVAL; | ||
126 | + | ||
127 | +out: | ||
128 | + g_free(desc_file_dir); | ||
129 | + return ret; | ||
130 | } | ||
131 | |||
132 | static int vmdk_open_desc_file(BlockDriverState *bs, int flags, char *buf, | ||
133 | @@ -XXX,XX +XXX,XX @@ static int vmdk_open_desc_file(BlockDriverState *bs, int flags, char *buf, | ||
134 | } | ||
135 | s->create_type = g_strdup(ct); | ||
136 | s->desc_offset = 0; | ||
137 | - ret = vmdk_parse_extents(buf, bs, bs->file->bs->exact_filename, options, | ||
138 | - errp); | ||
139 | + ret = vmdk_parse_extents(buf, bs, options, errp); | ||
140 | exit: | ||
141 | return ret; | ||
142 | } | ||
143 | diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059 | ||
144 | index XXXXXXX..XXXXXXX 100755 | ||
145 | --- a/tests/qemu-iotests/059 | ||
146 | +++ b/tests/qemu-iotests/059 | ||
147 | @@ -XXX,XX +XXX,XX @@ $QEMU_IMG convert -f qcow2 -O vmdk -o subformat=streamOptimized "$TEST_IMG.qcow2 | ||
148 | 92 | ||
149 | echo | 93 | echo |
150 | echo "=== Testing monolithicFlat with internally generated JSON file name ===" | 94 | echo === Running QEMU === |
151 | +# Should work, because bdrv_dirname() works fine with blkdebug | 95 | diff --git a/tests/qemu-iotests/085.out b/tests/qemu-iotests/085.out |
152 | IMGOPTS="subformat=monolithicFlat" _make_test_img 64M | ||
153 | -$QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.image.filename=$TEST_IMG,file.inject-error.0.event=read_aio" 2>&1 \ | ||
154 | - | _filter_testdir | _filter_imgfmt | ||
155 | +$QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.image.filename=$TEST_IMG,file.inject-error.0.event=read_aio" \ | ||
156 | + -c info \ | ||
157 | + 2>&1 \ | ||
158 | + | _filter_testdir | _filter_imgfmt | _filter_img_info | ||
159 | _cleanup_test_img | ||
160 | |||
161 | echo | ||
162 | diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out | ||
163 | index XXXXXXX..XXXXXXX 100644 | 96 | index XXXXXXX..XXXXXXX 100644 |
164 | --- a/tests/qemu-iotests/059.out | 97 | --- a/tests/qemu-iotests/085.out |
165 | +++ b/tests/qemu-iotests/059.out | 98 | +++ b/tests/qemu-iotests/085.out |
166 | @@ -XXX,XX +XXX,XX @@ wrote 512/512 bytes at offset 10240 | 99 | @@ -XXX,XX +XXX,XX @@ |
167 | 100 | QA output created by 085 | |
168 | === Testing monolithicFlat with internally generated JSON file name === | 101 | -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 |
169 | Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 | 102 | -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 |
170 | -qemu-io: can't open: Cannot use relative extent paths with VMDK descriptor file 'json:{"image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "driver": "blkdebug", "inject-error.0.event": "read_aio"}' | 103 | +Formatting 'TEST_DIR/t.IMGFMT.1', fmt=IMGFMT size=134217728 |
171 | +format name: IMGFMT | 104 | +Formatting 'TEST_DIR/t.IMGFMT.2', fmt=IMGFMT size=134217728 |
172 | +cluster size: 0 bytes | 105 | |
173 | +vm state offset: 0 bytes | 106 | === Running QEMU === |
174 | 107 | ||
175 | === Testing version 3 === | 108 | @@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/10-snapshot-v1.qcow2', fmt=qcow2 size=134217728 backing_fil |
176 | image: TEST_DIR/iotest-version3.IMGFMT | 109 | |
110 | === Create a couple of snapshots using blockdev-snapshot === | ||
111 | |||
112 | -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/10-snapshot-v0.IMGFMT | ||
113 | +Formatting 'TEST_DIR/11-snapshot-v0.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/10-snapshot-v0.IMGFMT | ||
114 | { 'execute': 'blockdev-add', 'arguments': { 'driver': 'IMGFMT', 'node-name': 'snap_11', 'backing': null, 'file': { 'driver': 'file', 'filename': 'TEST_DIR/11-snapshot-v0.IMGFMT', 'node-name': 'file_11' } } } | ||
115 | {"return": {}} | ||
116 | { 'execute': 'blockdev-snapshot', 'arguments': { 'node': 'virtio0', 'overlay':'snap_11' } } | ||
117 | {"return": {}} | ||
118 | -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/11-snapshot-v0.IMGFMT | ||
119 | +Formatting 'TEST_DIR/12-snapshot-v0.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/11-snapshot-v0.IMGFMT | ||
120 | { 'execute': 'blockdev-add', 'arguments': { 'driver': 'IMGFMT', 'node-name': 'snap_12', 'backing': null, 'file': { 'driver': 'file', 'filename': 'TEST_DIR/12-snapshot-v0.IMGFMT', 'node-name': 'file_12' } } } | ||
121 | {"return": {}} | ||
122 | { 'execute': 'blockdev-snapshot', 'arguments': { 'node': 'virtio0', 'overlay':'snap_12' } } | ||
177 | -- | 123 | -- |
178 | 2.21.0 | 124 | 2.24.1 |
179 | 125 | ||
180 | 126 | diff view generated by jsdifflib |
New patch | |||
---|---|---|---|
1 | The image end offset as reported by qemu-img check is different when | ||
2 | using an external data file; we do not care about its value here, so we | ||
3 | can just filter it. Incidentally, common.rc already has _check_test_img | ||
4 | for us which does exactly that. | ||
1 | 5 | ||
6 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
7 | Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> | ||
8 | Message-id: 20191107163708.833192-18-mreitz@redhat.com | ||
9 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
10 | --- | ||
11 | tests/qemu-iotests/091 | 2 +- | ||
12 | tests/qemu-iotests/091.out | 2 -- | ||
13 | 2 files changed, 1 insertion(+), 3 deletions(-) | ||
14 | |||
15 | diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091 | ||
16 | index XXXXXXX..XXXXXXX 100755 | ||
17 | --- a/tests/qemu-iotests/091 | ||
18 | +++ b/tests/qemu-iotests/091 | ||
19 | @@ -XXX,XX +XXX,XX @@ echo "Check image pattern" | ||
20 | ${QEMU_IO} -c "read -P 0x22 0 4M" "${TEST_IMG}" | _filter_testdir | _filter_qemu_io | ||
21 | |||
22 | echo "Running 'qemu-img check -r all \$TEST_IMG'" | ||
23 | -"${QEMU_IMG}" check -r all "${TEST_IMG}" 2>&1 | _filter_testdir | _filter_qemu | ||
24 | +_check_test_img -r all | ||
25 | |||
26 | echo "*** done" | ||
27 | rm -f $seq.full | ||
28 | diff --git a/tests/qemu-iotests/091.out b/tests/qemu-iotests/091.out | ||
29 | index XXXXXXX..XXXXXXX 100644 | ||
30 | --- a/tests/qemu-iotests/091.out | ||
31 | +++ b/tests/qemu-iotests/091.out | ||
32 | @@ -XXX,XX +XXX,XX @@ read 4194304/4194304 bytes at offset 0 | ||
33 | 4 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
34 | Running 'qemu-img check -r all $TEST_IMG' | ||
35 | No errors were found on the image. | ||
36 | -80/16384 = 0.49% allocated, 0.00% fragmented, 0.00% compressed clusters | ||
37 | -Image end offset: 5570560 | ||
38 | *** done | ||
39 | -- | ||
40 | 2.24.1 | ||
41 | |||
42 | diff view generated by jsdifflib |
1 | The error message for the test case where we have a quorum node for | 1 | The only difference is that the json:{} filename of the image looks |
---|---|---|---|
2 | which no directory name can be generated is different: For | 2 | different. We actually do not care about that filename in this test, we |
3 | twoGbMaxExtentSparse, it complains that it cannot open the extent file. | 3 | are only interested in (1) that there is a json:{} filename, and (2) |
4 | For other (sub)formats, it just notes that it cannot determine the | 4 | whether the backing filename can be constructed. |
5 | backing file path. Both are fine, but just disable twoGbMaxExtentSparse | 5 | |
6 | for simplicity's sake. | 6 | So just filter out the json:{} data, thus making this test pass both |
7 | with and without data_file. | ||
7 | 8 | ||
8 | Signed-off-by: Max Reitz <mreitz@redhat.com> | 9 | Signed-off-by: Max Reitz <mreitz@redhat.com> |
9 | Reviewed-by: John Snow <jsnow@redhat.com> | 10 | Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> |
10 | Message-id: 20190815153638.4600-7-mreitz@redhat.com | 11 | Message-id: 20191107163708.833192-19-mreitz@redhat.com |
11 | Reviewed-by: John Snow <jsnow@redhat.com> | ||
12 | Signed-off-by: Max Reitz <mreitz@redhat.com> | 12 | Signed-off-by: Max Reitz <mreitz@redhat.com> |
13 | --- | 13 | --- |
14 | tests/qemu-iotests/110 | 3 ++- | 14 | tests/qemu-iotests/110 | 7 +++++-- |
15 | 1 file changed, 2 insertions(+), 1 deletion(-) | 15 | tests/qemu-iotests/110.out | 4 ++-- |
16 | 2 files changed, 7 insertions(+), 4 deletions(-) | ||
16 | 17 | ||
17 | diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110 | 18 | diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110 |
18 | index XXXXXXX..XXXXXXX 100755 | 19 | index XXXXXXX..XXXXXXX 100755 |
19 | --- a/tests/qemu-iotests/110 | 20 | --- a/tests/qemu-iotests/110 |
20 | +++ b/tests/qemu-iotests/110 | 21 | +++ b/tests/qemu-iotests/110 |
21 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | 22 | @@ -XXX,XX +XXX,XX @@ echo |
22 | # Any format supporting backing files | 23 | # Across blkdebug without a config file, you cannot reconstruct filenames, so |
23 | _supported_fmt qed qcow qcow2 vmdk | 24 | # qemu is incapable of knowing the directory of the top image from the filename |
24 | _supported_proto file | 25 | # alone. However, using bdrv_dirname(), it should still work. |
25 | -_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" | 26 | +# (Filter out the json:{} filename so this test works with external data files) |
26 | +_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" \ | 27 | TEST_IMG="json:{ |
27 | + "subformat=twoGbMaxExtentSparse" | 28 | 'driver': '$IMGFMT', |
28 | 29 | 'file': { | |
29 | TEST_IMG_REL=$(basename "$TEST_IMG") | 30 | @@ -XXX,XX +XXX,XX @@ TEST_IMG="json:{ |
30 | 31 | } | |
32 | ] | ||
33 | } | ||
34 | -}" _img_info | _filter_img_info | grep -v 'backing file format' | ||
35 | +}" _img_info | _filter_img_info | grep -v 'backing file format' \ | ||
36 | + | _filter_json_filename | ||
37 | |||
38 | echo | ||
39 | echo '=== Backing name is always relative to the backed image ===' | ||
40 | @@ -XXX,XX +XXX,XX @@ TEST_IMG="json:{ | ||
41 | } | ||
42 | ] | ||
43 | } | ||
44 | -}" _img_info | _filter_img_info | grep -v 'backing file format' | ||
45 | +}" _img_info | _filter_img_info | grep -v 'backing file format' \ | ||
46 | + | _filter_json_filename | ||
47 | |||
48 | |||
49 | # success, all done | ||
50 | diff --git a/tests/qemu-iotests/110.out b/tests/qemu-iotests/110.out | ||
51 | index XXXXXXX..XXXXXXX 100644 | ||
52 | --- a/tests/qemu-iotests/110.out | ||
53 | +++ b/tests/qemu-iotests/110.out | ||
54 | @@ -XXX,XX +XXX,XX @@ backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base) | ||
55 | |||
56 | === Non-reconstructable filename === | ||
57 | |||
58 | -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}} | ||
59 | +image: json:{ /* filtered */ } | ||
60 | file format: IMGFMT | ||
61 | virtual size: 64 MiB (67108864 bytes) | ||
62 | backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base) | ||
63 | @@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=t.IMGFMT.b | ||
64 | |||
65 | === Nodes without a common directory === | ||
66 | |||
67 | -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}} | ||
68 | +image: json:{ /* filtered */ } | ||
69 | file format: IMGFMT | ||
70 | virtual size: 64 MiB (67108864 bytes) | ||
71 | backing file: t.IMGFMT.base (cannot determine actual path) | ||
31 | -- | 72 | -- |
32 | 2.21.0 | 73 | 2.24.1 |
33 | 74 | ||
34 | 75 | diff view generated by jsdifflib |
1 | iotest 126 requires backing file support, which flat vmdks cannot offer. | 1 | When using an external data file, there are no refcounts for data |
---|---|---|---|
2 | Skip this test for such subformats. | 2 | clusters. We thus have to adjust the corruption test in this patch to |
3 | not be based around a data cluster allocation, but the L2 table | ||
4 | allocation (L2 tables are still refcounted with external data files). | ||
5 | |||
6 | Furthermore, we should not print qcow2.py's list of incompatible | ||
7 | features because it differs depending on whether there is an external | ||
8 | data file or not. | ||
9 | |||
10 | With those two changes, the test will work both with and without | ||
11 | external data files (once that options works with the iotests at all). | ||
3 | 12 | ||
4 | Signed-off-by: Max Reitz <mreitz@redhat.com> | 13 | Signed-off-by: Max Reitz <mreitz@redhat.com> |
5 | Message-id: 20190815153638.4600-8-mreitz@redhat.com | 14 | Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> |
6 | Reviewed-by: John Snow <jsnow@redhat.com> | 15 | Message-id: 20191107163708.833192-20-mreitz@redhat.com |
7 | Signed-off-by: Max Reitz <mreitz@redhat.com> | 16 | Signed-off-by: Max Reitz <mreitz@redhat.com> |
8 | --- | 17 | --- |
9 | tests/qemu-iotests/126 | 2 ++ | 18 | tests/qemu-iotests/137 | 15 +++++++++++---- |
10 | 1 file changed, 2 insertions(+) | 19 | tests/qemu-iotests/137.out | 6 ++---- |
20 | 2 files changed, 13 insertions(+), 8 deletions(-) | ||
11 | 21 | ||
12 | diff --git a/tests/qemu-iotests/126 b/tests/qemu-iotests/126 | 22 | diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137 |
13 | index XXXXXXX..XXXXXXX 100755 | 23 | index XXXXXXX..XXXXXXX 100755 |
14 | --- a/tests/qemu-iotests/126 | 24 | --- a/tests/qemu-iotests/137 |
15 | +++ b/tests/qemu-iotests/126 | 25 | +++ b/tests/qemu-iotests/137 |
16 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | 26 | @@ -XXX,XX +XXX,XX @@ $QEMU_IO \ |
17 | 27 | "$TEST_IMG" 2>&1 | _filter_qemu_io | |
18 | # Needs backing file support | 28 | |
19 | _supported_fmt qcow qcow2 qed vmdk | 29 | # The dirty bit must not be set |
20 | +_unsupported_imgopts "subformat=monolithicFlat" \ | 30 | -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features |
21 | + "subformat=twoGbMaxExtentFlat" | 31 | +# (Filter the external data file bit) |
22 | # This is the default protocol (and we want to test the difference between | 32 | +if $PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features \ |
23 | # colons which separate a protocol prefix from the rest and colons which are | 33 | + | grep -q '\<0\>' |
24 | # just part of the filename, so we cannot test protocols which require a prefix) | 34 | +then |
35 | + echo 'ERROR: Dirty bit set' | ||
36 | +else | ||
37 | + echo 'OK: Dirty bit not set' | ||
38 | +fi | ||
39 | |||
40 | # Similarly we can test whether corruption detection has been enabled: | ||
41 | -# Create L1/L2, overwrite first entry in refcount block, allocate something. | ||
42 | +# Create L1, overwrite refcounts, force allocation of L2 by writing | ||
43 | +# data. | ||
44 | # Disabling the checks should fail, so the corruption must be detected. | ||
45 | _make_test_img 64M | ||
46 | -$QEMU_IO -c "write 0 64k" "$TEST_IMG" | _filter_qemu_io | ||
47 | -poke_file "$TEST_IMG" "$((0x20000))" "\x00\x00" | ||
48 | +poke_file "$TEST_IMG" "$((0x20000))" "\x00\x00\x00\x00\x00\x00\x00\x00" | ||
49 | $QEMU_IO \ | ||
50 | -c "reopen -o overlap-check=none,lazy-refcounts=42" \ | ||
51 | -c "write 64k 64k" \ | ||
52 | diff --git a/tests/qemu-iotests/137.out b/tests/qemu-iotests/137.out | ||
53 | index XXXXXXX..XXXXXXX 100644 | ||
54 | --- a/tests/qemu-iotests/137.out | ||
55 | +++ b/tests/qemu-iotests/137.out | ||
56 | @@ -XXX,XX +XXX,XX @@ qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are | ||
57 | wrote 512/512 bytes at offset 0 | ||
58 | 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
59 | ./common.rc: Killed ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" ) | ||
60 | -incompatible_features [] | ||
61 | +OK: Dirty bit not set | ||
62 | Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 | ||
63 | -wrote 65536/65536 bytes at offset 0 | ||
64 | -64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
65 | qemu-io: Parameter 'lazy-refcounts' expects 'on' or 'off' | ||
66 | -qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with qcow2_header); further corruption events will be suppressed | ||
67 | +qcow2: Marking image as corrupt: Preventing invalid allocation of L2 table at offset 0; further corruption events will be suppressed | ||
68 | write failed: Input/output error | ||
69 | *** done | ||
25 | -- | 70 | -- |
26 | 2.21.0 | 71 | 2.24.1 |
27 | 72 | ||
28 | 73 | diff view generated by jsdifflib |
1 | We had a test for a case where relative extent paths did not work, but | 1 | We do not care about the json:{} filenames here, so we can just filter |
---|---|---|---|
2 | unfortunately we just fixed the underlying problem, so it works now. | 2 | them out and thus make the test work both with and without external data |
3 | This patch adds a new test case that still fails. | 3 | files. |
4 | 4 | ||
5 | Signed-off-by: Max Reitz <mreitz@redhat.com> | 5 | Signed-off-by: Max Reitz <mreitz@redhat.com> |
6 | Reviewed-by: John Snow <jsnow@redhat.com> | 6 | Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> |
7 | Message-id: 20190815153638.4600-4-mreitz@redhat.com | 7 | Message-id: 20191107163708.833192-21-mreitz@redhat.com |
8 | Reviewed-by: John Snow <jsnow@redhat.com> | ||
9 | Signed-off-by: Max Reitz <mreitz@redhat.com> | 8 | Signed-off-by: Max Reitz <mreitz@redhat.com> |
10 | --- | 9 | --- |
11 | tests/qemu-iotests/059 | 27 +++++++++++++++++++++++++++ | 10 | tests/qemu-iotests/198 | 6 ++++-- |
12 | tests/qemu-iotests/059.out | 4 ++++ | 11 | tests/qemu-iotests/198.out | 4 ++-- |
13 | 2 files changed, 31 insertions(+) | 12 | 2 files changed, 6 insertions(+), 4 deletions(-) |
14 | 13 | ||
15 | diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059 | 14 | diff --git a/tests/qemu-iotests/198 b/tests/qemu-iotests/198 |
16 | index XXXXXXX..XXXXXXX 100755 | 15 | index XXXXXXX..XXXXXXX 100755 |
17 | --- a/tests/qemu-iotests/059 | 16 | --- a/tests/qemu-iotests/198 |
18 | +++ b/tests/qemu-iotests/059 | 17 | +++ b/tests/qemu-iotests/198 |
19 | @@ -XXX,XX +XXX,XX @@ $QEMU_IMG convert -f qcow2 -O vmdk -o subformat=streamOptimized "$TEST_IMG.qcow2 | 18 | @@ -XXX,XX +XXX,XX @@ echo |
19 | echo "== checking image base ==" | ||
20 | $QEMU_IMG info --image-opts $IMGSPECBASE | _filter_img_info --format-specific \ | ||
21 | | sed -e "/^disk size:/ D" -e '/refcount bits:/ D' -e '/compat:/ D' \ | ||
22 | - -e '/lazy refcounts:/ D' -e '/corrupt:/ D' | ||
23 | + -e '/lazy refcounts:/ D' -e '/corrupt:/ D' -e '/^\s*data file/ D' \ | ||
24 | + | _filter_json_filename | ||
20 | 25 | ||
21 | echo | 26 | echo |
22 | echo "=== Testing monolithicFlat with internally generated JSON file name ===" | 27 | echo "== checking image layer ==" |
23 | + | 28 | $QEMU_IMG info --image-opts $IMGSPECLAYER | _filter_img_info --format-specific \ |
24 | +echo '--- blkdebug ---' | 29 | | sed -e "/^disk size:/ D" -e '/refcount bits:/ D' -e '/compat:/ D' \ |
25 | # Should work, because bdrv_dirname() works fine with blkdebug | 30 | - -e '/lazy refcounts:/ D' -e '/corrupt:/ D' |
26 | IMGOPTS="subformat=monolithicFlat" _make_test_img 64M | 31 | + -e '/lazy refcounts:/ D' -e '/corrupt:/ D' -e '/^\s*data file/ D' \ |
27 | $QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.image.filename=$TEST_IMG,file.inject-error.0.event=read_aio" \ | 32 | + | _filter_json_filename |
28 | @@ -XXX,XX +XXX,XX @@ $QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.image.filename=$TE | 33 | |
29 | | _filter_testdir | _filter_imgfmt | _filter_img_info | 34 | |
30 | _cleanup_test_img | 35 | # success, all done |
31 | 36 | diff --git a/tests/qemu-iotests/198.out b/tests/qemu-iotests/198.out | |
32 | +echo '--- quorum ---' | ||
33 | +# Should not work, because bdrv_dirname() does not work with quorum | ||
34 | +IMGOPTS="subformat=monolithicFlat" _make_test_img 64M | ||
35 | +cp "$TEST_IMG" "$TEST_IMG.orig" | ||
36 | + | ||
37 | +filename="json:{ | ||
38 | + \"driver\": \"$IMGFMT\", | ||
39 | + \"file\": { | ||
40 | + \"driver\": \"quorum\", | ||
41 | + \"children\": [ { | ||
42 | + \"driver\": \"file\", | ||
43 | + \"filename\": \"$TEST_IMG\" | ||
44 | + }, { | ||
45 | + \"driver\": \"file\", | ||
46 | + \"filename\": \"$TEST_IMG.orig\" | ||
47 | + } ], | ||
48 | + \"vote-threshold\": 1 | ||
49 | + } }" | ||
50 | + | ||
51 | +filename=$(echo "$filename" | tr '\n' ' ' | sed -e 's/\s\+/ /g') | ||
52 | +$QEMU_IMG info "$filename" 2>&1 \ | ||
53 | + | sed -e "s/'json:[^']*'/\$QUORUM_FILE/g" \ | ||
54 | + | _filter_testdir | _filter_imgfmt | _filter_img_info | ||
55 | + | ||
56 | + | ||
57 | echo | ||
58 | echo "=== Testing version 3 ===" | ||
59 | _use_sample_img iotest-version3.vmdk.bz2 | ||
60 | diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out | ||
61 | index XXXXXXX..XXXXXXX 100644 | 37 | index XXXXXXX..XXXXXXX 100644 |
62 | --- a/tests/qemu-iotests/059.out | 38 | --- a/tests/qemu-iotests/198.out |
63 | +++ b/tests/qemu-iotests/059.out | 39 | +++ b/tests/qemu-iotests/198.out |
64 | @@ -XXX,XX +XXX,XX @@ wrote 512/512 bytes at offset 10240 | 40 | @@ -XXX,XX +XXX,XX @@ read 16777216/16777216 bytes at offset 0 |
65 | 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | 41 | 16 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) |
66 | 42 | ||
67 | === Testing monolithicFlat with internally generated JSON file name === | 43 | == checking image base == |
68 | +--- blkdebug --- | 44 | -image: json:{"encrypt.key-secret": "sec0", "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT.base"}} |
69 | Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 | 45 | +image: json:{ /* filtered */ } |
70 | format name: IMGFMT | 46 | file format: IMGFMT |
71 | cluster size: 0 bytes | 47 | virtual size: 16 MiB (16777216 bytes) |
72 | vm state offset: 0 bytes | 48 | Format specific information: |
73 | +--- quorum --- | 49 | @@ -XXX,XX +XXX,XX @@ Format specific information: |
74 | +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 | 50 | master key iters: 1024 |
75 | +qemu-img: Could not open $QUORUM_FILE: Cannot use relative paths with VMDK descriptor file $QUORUM_FILE: Cannot generate a base directory for quorum nodes | 51 | |
76 | 52 | == checking image layer == | |
77 | === Testing version 3 === | 53 | -image: json:{"encrypt.key-secret": "sec1", "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}} |
78 | image: TEST_DIR/iotest-version3.IMGFMT | 54 | +image: json:{ /* filtered */ } |
55 | file format: IMGFMT | ||
56 | virtual size: 16 MiB (16777216 bytes) | ||
57 | backing file: TEST_DIR/t.IMGFMT.base | ||
79 | -- | 58 | -- |
80 | 2.21.0 | 59 | 2.24.1 |
81 | 60 | ||
82 | 61 | diff view generated by jsdifflib |
1 | From: Thomas Huth <thuth@redhat.com> | 1 | Signed-off-by: Max Reitz <mreitz@redhat.com> |
---|---|---|---|
2 | 2 | Message-id: 20191107163708.833192-22-mreitz@redhat.com | |
3 | It is possible to enable only a subset of the block drivers with the | 3 | [mreitz: Also disable 273] |
4 | "--block-drv-rw-whitelist" option of the "configure" script. All other | ||
5 | drivers are marked as unusable (or only included as read-only with the | ||
6 | "--block-drv-ro-whitelist" option). If an iotest is now using such a | ||
7 | disabled block driver, it is failing - which is bad, since at least the | ||
8 | tests in the "auto" group should be able to deal with this situation. | ||
9 | Thus let's introduce a "_require_drivers" function that can be used by | ||
10 | the shell tests to check for the availability of certain drivers first, | ||
11 | and marks the test as "not run" if one of the drivers is missing. | ||
12 | |||
13 | This patch mainly targets the test in the "auto" group which should | ||
14 | never fail in such a case, but also improves some of the other tests | ||
15 | along the way. Note that we also assume that the "qcow2" and "file" | ||
16 | drivers are always available - otherwise it does not make sense to | ||
17 | run "make check-block" at all (which only tests with qcow2 by default). | ||
18 | |||
19 | Signed-off-by: Thomas Huth <thuth@redhat.com> | ||
20 | Message-id: 20190823133552.11680-1-thuth@redhat.com | ||
21 | Signed-off-by: Max Reitz <mreitz@redhat.com> | 4 | Signed-off-by: Max Reitz <mreitz@redhat.com> |
22 | --- | 5 | --- |
23 | tests/qemu-iotests/071 | 1 + | 6 | tests/qemu-iotests/007 | 5 +++-- |
24 | tests/qemu-iotests/081 | 4 +--- | 7 | tests/qemu-iotests/014 | 2 ++ |
25 | tests/qemu-iotests/099 | 1 + | 8 | tests/qemu-iotests/015 | 5 +++-- |
26 | tests/qemu-iotests/120 | 1 + | 9 | tests/qemu-iotests/026 | 5 ++++- |
27 | tests/qemu-iotests/162 | 4 +--- | 10 | tests/qemu-iotests/029 | 5 +++-- |
28 | tests/qemu-iotests/184 | 1 + | 11 | tests/qemu-iotests/031 | 6 +++--- |
29 | tests/qemu-iotests/186 | 1 + | 12 | tests/qemu-iotests/036 | 5 +++-- |
30 | tests/qemu-iotests/common.rc | 14 ++++++++++++++ | 13 | tests/qemu-iotests/039 | 3 +++ |
31 | 8 files changed, 21 insertions(+), 6 deletions(-) | 14 | tests/qemu-iotests/046 | 2 ++ |
15 | tests/qemu-iotests/048 | 2 ++ | ||
16 | tests/qemu-iotests/051 | 5 +++-- | ||
17 | tests/qemu-iotests/058 | 5 +++-- | ||
18 | tests/qemu-iotests/060 | 6 ++++-- | ||
19 | tests/qemu-iotests/061 | 6 ++++-- | ||
20 | tests/qemu-iotests/062 | 2 +- | ||
21 | tests/qemu-iotests/066 | 4 +++- | ||
22 | tests/qemu-iotests/067 | 6 ++++-- | ||
23 | tests/qemu-iotests/068 | 5 +++-- | ||
24 | tests/qemu-iotests/071 | 3 +++ | ||
25 | tests/qemu-iotests/073 | 4 ++++ | ||
26 | tests/qemu-iotests/074 | 2 ++ | ||
27 | tests/qemu-iotests/080 | 5 +++-- | ||
28 | tests/qemu-iotests/090 | 2 ++ | ||
29 | tests/qemu-iotests/098 | 6 ++++-- | ||
30 | tests/qemu-iotests/099 | 3 ++- | ||
31 | tests/qemu-iotests/103 | 5 +++-- | ||
32 | tests/qemu-iotests/108 | 6 ++++-- | ||
33 | tests/qemu-iotests/112 | 5 +++-- | ||
34 | tests/qemu-iotests/114 | 2 ++ | ||
35 | tests/qemu-iotests/121 | 3 +++ | ||
36 | tests/qemu-iotests/138 | 3 +++ | ||
37 | tests/qemu-iotests/156 | 2 ++ | ||
38 | tests/qemu-iotests/176 | 7 +++++-- | ||
39 | tests/qemu-iotests/191 | 2 ++ | ||
40 | tests/qemu-iotests/201 | 6 +++--- | ||
41 | tests/qemu-iotests/214 | 3 ++- | ||
42 | tests/qemu-iotests/217 | 3 ++- | ||
43 | tests/qemu-iotests/220 | 5 +++-- | ||
44 | tests/qemu-iotests/243 | 6 ++++-- | ||
45 | tests/qemu-iotests/244 | 5 +++-- | ||
46 | tests/qemu-iotests/250 | 2 ++ | ||
47 | tests/qemu-iotests/261 | 3 ++- | ||
48 | tests/qemu-iotests/267 | 5 +++-- | ||
49 | tests/qemu-iotests/273 | 3 +++ | ||
50 | 44 files changed, 127 insertions(+), 53 deletions(-) | ||
32 | 51 | ||
52 | diff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007 | ||
53 | index XXXXXXX..XXXXXXX 100755 | ||
54 | --- a/tests/qemu-iotests/007 | ||
55 | +++ b/tests/qemu-iotests/007 | ||
56 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
57 | _supported_fmt qcow2 | ||
58 | _supported_proto generic | ||
59 | # refcount_bits must be at least 4 so we can create ten internal snapshots | ||
60 | -# (1 bit supports none, 2 bits support two, 4 bits support 14) | ||
61 | -_unsupported_imgopts 'refcount_bits=\(1\|2\)[^0-9]' | ||
62 | +# (1 bit supports none, 2 bits support two, 4 bits support 14); | ||
63 | +# snapshot are generally impossible with external data files | ||
64 | +_unsupported_imgopts 'refcount_bits=\(1\|2\)[^0-9]' data_file | ||
65 | |||
66 | echo | ||
67 | echo "creating image" | ||
68 | diff --git a/tests/qemu-iotests/014 b/tests/qemu-iotests/014 | ||
69 | index XXXXXXX..XXXXXXX 100755 | ||
70 | --- a/tests/qemu-iotests/014 | ||
71 | +++ b/tests/qemu-iotests/014 | ||
72 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
73 | _supported_fmt qcow2 | ||
74 | _supported_proto file | ||
75 | _supported_os Linux | ||
76 | +# Compression and snapshots do not work with external data files | ||
77 | +_unsupported_imgopts data_file | ||
78 | |||
79 | TEST_OFFSETS="0 4294967296" | ||
80 | TEST_OPS="writev read write readv" | ||
81 | diff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015 | ||
82 | index XXXXXXX..XXXXXXX 100755 | ||
83 | --- a/tests/qemu-iotests/015 | ||
84 | +++ b/tests/qemu-iotests/015 | ||
85 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
86 | # actually any format that supports snapshots | ||
87 | _supported_fmt qcow2 | ||
88 | _supported_proto generic | ||
89 | -# Internal snapshots are (currently) impossible with refcount_bits=1 | ||
90 | -_unsupported_imgopts 'refcount_bits=1[^0-9]' | ||
91 | +# Internal snapshots are (currently) impossible with refcount_bits=1, | ||
92 | +# and generally impossible with external data files | ||
93 | +_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file | ||
94 | |||
95 | echo | ||
96 | echo "creating image" | ||
97 | diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026 | ||
98 | index XXXXXXX..XXXXXXX 100755 | ||
99 | --- a/tests/qemu-iotests/026 | ||
100 | +++ b/tests/qemu-iotests/026 | ||
101 | @@ -XXX,XX +XXX,XX @@ _supported_cache_modes writethrough none | ||
102 | # 32 and 64 bits do not work either, however, due to different leaked cluster | ||
103 | # count on error. | ||
104 | # Thus, the only remaining option is refcount_bits=16. | ||
105 | -_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' | ||
106 | +# | ||
107 | +# As for data_file, none of the refcount tests can work for it. | ||
108 | +_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' \ | ||
109 | + data_file | ||
110 | |||
111 | echo "Errors while writing 128 kB" | ||
112 | echo | ||
113 | diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029 | ||
114 | index XXXXXXX..XXXXXXX 100755 | ||
115 | --- a/tests/qemu-iotests/029 | ||
116 | +++ b/tests/qemu-iotests/029 | ||
117 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
118 | _supported_fmt qcow2 | ||
119 | _supported_proto generic | ||
120 | _unsupported_proto vxhs | ||
121 | -# Internal snapshots are (currently) impossible with refcount_bits=1 | ||
122 | -_unsupported_imgopts 'refcount_bits=1[^0-9]' | ||
123 | +# Internal snapshots are (currently) impossible with refcount_bits=1, | ||
124 | +# and generally impossible with external data files | ||
125 | +_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file | ||
126 | |||
127 | offset_size=24 | ||
128 | offset_l1_size=36 | ||
129 | diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031 | ||
130 | index XXXXXXX..XXXXXXX 100755 | ||
131 | --- a/tests/qemu-iotests/031 | ||
132 | +++ b/tests/qemu-iotests/031 | ||
133 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
134 | # This tests qcow2-specific low-level functionality | ||
135 | _supported_fmt qcow2 | ||
136 | _supported_proto file | ||
137 | -# We want to test compat=0.10, which does not support refcount widths | ||
138 | -# other than 16 | ||
139 | -_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' | ||
140 | +# We want to test compat=0.10, which does not support external data | ||
141 | +# files or refcount widths other than 16 | ||
142 | +_unsupported_imgopts data_file 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' | ||
143 | |||
144 | CLUSTER_SIZE=65536 | ||
145 | |||
146 | diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036 | ||
147 | index XXXXXXX..XXXXXXX 100755 | ||
148 | --- a/tests/qemu-iotests/036 | ||
149 | +++ b/tests/qemu-iotests/036 | ||
150 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
151 | # This tests qcow2-specific low-level functionality | ||
152 | _supported_fmt qcow2 | ||
153 | _supported_proto file | ||
154 | -# Only qcow2v3 and later supports feature bits | ||
155 | -_unsupported_imgopts 'compat=0.10' | ||
156 | +# Only qcow2v3 and later supports feature bits; | ||
157 | +# qcow2.py does not support external data files | ||
158 | +_unsupported_imgopts 'compat=0.10' data_file | ||
159 | |||
160 | echo | ||
161 | echo === Image with unknown incompatible feature bit === | ||
162 | diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039 | ||
163 | index XXXXXXX..XXXXXXX 100755 | ||
164 | --- a/tests/qemu-iotests/039 | ||
165 | +++ b/tests/qemu-iotests/039 | ||
166 | @@ -XXX,XX +XXX,XX @@ _supported_proto file | ||
167 | _supported_os Linux | ||
168 | _default_cache_mode writethrough | ||
169 | _supported_cache_modes writethrough | ||
170 | +# Some of these test cases expect no external data file so that all | ||
171 | +# clusters are part of the qcow2 image and refcounted | ||
172 | +_unsupported_imgopts data_file | ||
173 | |||
174 | size=128M | ||
175 | |||
176 | diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046 | ||
177 | index XXXXXXX..XXXXXXX 100755 | ||
178 | --- a/tests/qemu-iotests/046 | ||
179 | +++ b/tests/qemu-iotests/046 | ||
180 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
181 | |||
182 | _supported_fmt qcow2 | ||
183 | _supported_proto file | ||
184 | +# data_file does not support compressed clusters | ||
185 | +_unsupported_imgopts data_file | ||
186 | |||
187 | CLUSTER_SIZE=64k | ||
188 | size=128M | ||
189 | diff --git a/tests/qemu-iotests/048 b/tests/qemu-iotests/048 | ||
190 | index XXXXXXX..XXXXXXX 100755 | ||
191 | --- a/tests/qemu-iotests/048 | ||
192 | +++ b/tests/qemu-iotests/048 | ||
193 | @@ -XXX,XX +XXX,XX @@ _compare() | ||
194 | _supported_fmt raw qcow2 qed luks | ||
195 | _supported_proto file | ||
196 | _supported_os Linux | ||
197 | +# Using 'cp' is incompatible with external data files | ||
198 | +_unsupported_imgopts data_file | ||
199 | |||
200 | # Remove once all tests are fixed to use TEST_IMG_FILE | ||
201 | # correctly and common.rc sets it unconditionally | ||
202 | diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 | ||
203 | index XXXXXXX..XXXXXXX 100755 | ||
204 | --- a/tests/qemu-iotests/051 | ||
205 | +++ b/tests/qemu-iotests/051 | ||
206 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
207 | _supported_fmt qcow2 | ||
208 | _supported_proto file | ||
209 | # A compat=0.10 image is created in this test which does not support anything | ||
210 | -# other than refcount_bits=16 | ||
211 | -_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' | ||
212 | +# other than refcount_bits=16; | ||
213 | +# it also will not support an external data file | ||
214 | +_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file | ||
215 | _require_drivers nbd | ||
216 | |||
217 | do_run_qemu() | ||
218 | diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058 | ||
219 | index XXXXXXX..XXXXXXX 100755 | ||
220 | --- a/tests/qemu-iotests/058 | ||
221 | +++ b/tests/qemu-iotests/058 | ||
222 | @@ -XXX,XX +XXX,XX @@ _supported_fmt qcow2 | ||
223 | _supported_proto file | ||
224 | _supported_os Linux | ||
225 | _require_command QEMU_NBD | ||
226 | -# Internal snapshots are (currently) impossible with refcount_bits=1 | ||
227 | -_unsupported_imgopts 'refcount_bits=1[^0-9]' | ||
228 | +# Internal snapshots are (currently) impossible with refcount_bits=1, | ||
229 | +# and generally impossible with external data files | ||
230 | +_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file | ||
231 | |||
232 | nbd_snapshot_img="nbd:unix:$nbd_unix_socket" | ||
233 | |||
234 | diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060 | ||
235 | index XXXXXXX..XXXXXXX 100755 | ||
236 | --- a/tests/qemu-iotests/060 | ||
237 | +++ b/tests/qemu-iotests/060 | ||
238 | @@ -XXX,XX +XXX,XX @@ _filter_io_error() | ||
239 | _supported_fmt qcow2 | ||
240 | _supported_proto file | ||
241 | _supported_os Linux | ||
242 | -# These tests only work for compat=1.1 images with refcount_bits=16 | ||
243 | -_unsupported_imgopts 'compat=0.10' 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' | ||
244 | +# These tests only work for compat=1.1 images without an external | ||
245 | +# data file with refcount_bits=16 | ||
246 | +_unsupported_imgopts 'compat=0.10' data_file \ | ||
247 | + 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' | ||
248 | |||
249 | # The repair process will create a large file - so check for availability first | ||
250 | _require_large_file 64G | ||
251 | diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061 | ||
252 | index XXXXXXX..XXXXXXX 100755 | ||
253 | --- a/tests/qemu-iotests/061 | ||
254 | +++ b/tests/qemu-iotests/061 | ||
255 | @@ -XXX,XX +XXX,XX @@ _supported_fmt qcow2 | ||
256 | _supported_proto file | ||
257 | _supported_os Linux | ||
258 | # Conversion between different compat versions can only really work | ||
259 | -# with refcount_bits=16 | ||
260 | -_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' | ||
261 | +# with refcount_bits=16; | ||
262 | +# we have explicit tests for data_file here, but the whole test does | ||
263 | +# not work with it | ||
264 | +_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file | ||
265 | |||
266 | echo | ||
267 | echo "=== Testing version downgrade with zero expansion ===" | ||
268 | diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062 | ||
269 | index XXXXXXX..XXXXXXX 100755 | ||
270 | --- a/tests/qemu-iotests/062 | ||
271 | +++ b/tests/qemu-iotests/062 | ||
272 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
273 | _supported_fmt qcow2 | ||
274 | _supported_proto generic | ||
275 | # We need zero clusters and snapshots | ||
276 | -_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]' | ||
277 | +_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]' data_file | ||
278 | |||
279 | IMG_SIZE=64M | ||
280 | |||
281 | diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066 | ||
282 | index XXXXXXX..XXXXXXX 100755 | ||
283 | --- a/tests/qemu-iotests/066 | ||
284 | +++ b/tests/qemu-iotests/066 | ||
285 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
286 | _supported_fmt qcow2 | ||
287 | _supported_proto generic | ||
288 | # We need zero clusters and snapshots | ||
289 | -_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]' | ||
290 | +# (TODO: Consider splitting the snapshot part into a separate test | ||
291 | +# file, so this one runs with refcount_bits=1 and data_file) | ||
292 | +_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]' data_file | ||
293 | |||
294 | # Intentionally create an unaligned image | ||
295 | IMG_SIZE=$((64 * 1024 * 1024 + 512)) | ||
296 | diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067 | ||
297 | index XXXXXXX..XXXXXXX 100755 | ||
298 | --- a/tests/qemu-iotests/067 | ||
299 | +++ b/tests/qemu-iotests/067 | ||
300 | @@ -XXX,XX +XXX,XX @@ status=1 # failure is the default! | ||
301 | |||
302 | _supported_fmt qcow2 | ||
303 | _supported_proto file | ||
304 | -# Because anything other than 16 would change the output of query-block | ||
305 | -_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' | ||
306 | +# Because anything other than 16 would change the output of query-block, | ||
307 | +# and external data files would change the output of | ||
308 | +# query-named-block-nodes | ||
309 | +_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file | ||
310 | |||
311 | do_run_qemu() | ||
312 | { | ||
313 | diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068 | ||
314 | index XXXXXXX..XXXXXXX 100755 | ||
315 | --- a/tests/qemu-iotests/068 | ||
316 | +++ b/tests/qemu-iotests/068 | ||
317 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
318 | # This tests qcow2-specific low-level functionality | ||
319 | _supported_fmt qcow2 | ||
320 | _supported_proto generic | ||
321 | -# Internal snapshots are (currently) impossible with refcount_bits=1 | ||
322 | -_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]' | ||
323 | +# Internal snapshots are (currently) impossible with refcount_bits=1, | ||
324 | +# and generally impossible with external data files | ||
325 | +_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]' data_file | ||
326 | |||
327 | IMG_SIZE=128K | ||
328 | |||
33 | diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071 | 329 | diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071 |
34 | index XXXXXXX..XXXXXXX 100755 | 330 | index XXXXXXX..XXXXXXX 100755 |
35 | --- a/tests/qemu-iotests/071 | 331 | --- a/tests/qemu-iotests/071 |
36 | +++ b/tests/qemu-iotests/071 | 332 | +++ b/tests/qemu-iotests/071 |
37 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | 333 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 |
38 | 334 | _supported_fmt qcow2 | |
39 | _supported_fmt qcow2 | 335 | _supported_proto file |
40 | _supported_proto file | 336 | _require_drivers blkdebug blkverify |
41 | +_require_drivers blkdebug blkverify | 337 | +# blkdebug can only inject errors on bs->file, not on the data_file, |
338 | +# so thie test does not work with external data files | ||
339 | +_unsupported_imgopts data_file | ||
42 | 340 | ||
43 | do_run_qemu() | 341 | do_run_qemu() |
44 | { | 342 | { |
45 | diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081 | 343 | diff --git a/tests/qemu-iotests/073 b/tests/qemu-iotests/073 |
46 | index XXXXXXX..XXXXXXX 100755 | 344 | index XXXXXXX..XXXXXXX 100755 |
47 | --- a/tests/qemu-iotests/081 | 345 | --- a/tests/qemu-iotests/073 |
48 | +++ b/tests/qemu-iotests/081 | 346 | +++ b/tests/qemu-iotests/073 |
49 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | 347 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 |
50 | _supported_fmt raw | 348 | _supported_fmt qcow2 |
51 | _supported_proto file | 349 | _supported_proto generic |
52 | _supported_os Linux | 350 | _unsupported_proto vxhs |
53 | +_require_drivers quorum | 351 | +# External data files do not support compressed clusters |
352 | +# (TODO: Consider writing a version for external data files that does | ||
353 | +# not test compressed clusters) | ||
354 | +_unsupported_imgopts data_file | ||
355 | |||
356 | CLUSTER_SIZE=64k | ||
357 | size=128M | ||
358 | diff --git a/tests/qemu-iotests/074 b/tests/qemu-iotests/074 | ||
359 | index XXXXXXX..XXXXXXX 100755 | ||
360 | --- a/tests/qemu-iotests/074 | ||
361 | +++ b/tests/qemu-iotests/074 | ||
362 | @@ -XXX,XX +XXX,XX @@ _compare() | ||
363 | _supported_fmt qcow2 | ||
364 | _supported_proto file | ||
365 | _supported_os Linux | ||
366 | +# blkdebug can only inject errors on bs->file | ||
367 | +_unsupported_imgopts data_file | ||
368 | |||
369 | # Setup test basic parameters | ||
370 | TEST_IMG2=$TEST_IMG.2 | ||
371 | diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080 | ||
372 | index XXXXXXX..XXXXXXX 100755 | ||
373 | --- a/tests/qemu-iotests/080 | ||
374 | +++ b/tests/qemu-iotests/080 | ||
375 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
376 | _supported_fmt qcow2 | ||
377 | _supported_proto file | ||
378 | _supported_os Linux | ||
379 | -# - Internal snapshots are (currently) impossible with refcount_bits=1 | ||
380 | +# - Internal snapshots are (currently) impossible with refcount_bits=1, | ||
381 | +# and generally impossible with external data files | ||
382 | # - This is generally a test for compat=1.1 images | ||
383 | -_unsupported_imgopts 'refcount_bits=1[^0-9]' 'compat=0.10' | ||
384 | +_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file 'compat=0.10' | ||
385 | |||
386 | header_size=104 | ||
387 | |||
388 | diff --git a/tests/qemu-iotests/090 b/tests/qemu-iotests/090 | ||
389 | index XXXXXXX..XXXXXXX 100755 | ||
390 | --- a/tests/qemu-iotests/090 | ||
391 | +++ b/tests/qemu-iotests/090 | ||
392 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
393 | |||
394 | _supported_fmt qcow2 | ||
395 | _supported_proto file nfs | ||
396 | +# External data files do not support compressed clusters | ||
397 | +_unsupported_imgopts data_file | ||
398 | |||
399 | IMG_SIZE=128K | ||
400 | |||
401 | diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098 | ||
402 | index XXXXXXX..XXXXXXX 100755 | ||
403 | --- a/tests/qemu-iotests/098 | ||
404 | +++ b/tests/qemu-iotests/098 | ||
405 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
406 | |||
407 | _supported_fmt qcow2 | ||
408 | _supported_proto file | ||
409 | -# The code path we want to test here only works for compat=1.1 images | ||
410 | -_unsupported_imgopts 'compat=0.10' | ||
411 | +# The code path we want to test here only works for compat=1.1 images; | ||
412 | +# blkdebug can only inject errors on bs->file, so external data files | ||
413 | +# do not work with this test | ||
414 | +_unsupported_imgopts 'compat=0.10' data_file | ||
415 | |||
416 | for event in l1_update empty_image_prepare reftable_update refblock_alloc; do | ||
417 | |||
418 | diff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099 | ||
419 | index XXXXXXX..XXXXXXX 100755 | ||
420 | --- a/tests/qemu-iotests/099 | ||
421 | +++ b/tests/qemu-iotests/099 | ||
422 | @@ -XXX,XX +XXX,XX @@ _supported_fmt qcow qcow2 qed vdi vhdx vmdk vpc | ||
423 | _supported_proto file | ||
424 | _supported_os Linux | ||
425 | _require_drivers blkdebug blkverify | ||
426 | +# data_file would change the json:{} filenames | ||
427 | _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" \ | ||
428 | - "subformat=twoGbMaxExtentSparse" | ||
429 | + "subformat=twoGbMaxExtentSparse" data_file | ||
54 | 430 | ||
55 | do_run_qemu() | 431 | do_run_qemu() |
56 | { | 432 | { |
57 | @@ -XXX,XX +XXX,XX @@ run_qemu() | 433 | diff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103 |
58 | | _filter_qemu_io | _filter_generated_node_ids | 434 | index XXXXXXX..XXXXXXX 100755 |
59 | } | 435 | --- a/tests/qemu-iotests/103 |
60 | 436 | +++ b/tests/qemu-iotests/103 | |
61 | -test_quorum=$($QEMU_IMG --help|grep quorum) | 437 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 |
62 | -[ "$test_quorum" = "" ] && _supported_fmt quorum | 438 | |
63 | - | 439 | _supported_fmt qcow2 |
64 | quorum="driver=raw,file.driver=quorum,file.vote-threshold=2" | 440 | _supported_proto file nfs |
65 | quorum="$quorum,file.children.0.file.filename=$TEST_DIR/1.raw" | 441 | -# Internal snapshots are (currently) impossible with refcount_bits=1 |
66 | quorum="$quorum,file.children.1.file.filename=$TEST_DIR/2.raw" | 442 | -_unsupported_imgopts 'refcount_bits=1[^0-9]' |
67 | diff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099 | 443 | +# Internal snapshots are (currently) impossible with refcount_bits=1, |
68 | index XXXXXXX..XXXXXXX 100755 | 444 | +# and generally impossible with external data files |
69 | --- a/tests/qemu-iotests/099 | 445 | +_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file |
70 | +++ b/tests/qemu-iotests/099 | 446 | |
71 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | 447 | IMG_SIZE=64K |
72 | _supported_fmt qcow qcow2 qed vdi vhdx vmdk vpc | 448 | |
73 | _supported_proto file | 449 | diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108 |
74 | _supported_os Linux | 450 | index XXXXXXX..XXXXXXX 100755 |
75 | +_require_drivers blkdebug blkverify | 451 | --- a/tests/qemu-iotests/108 |
76 | _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" \ | 452 | +++ b/tests/qemu-iotests/108 |
77 | "subformat=twoGbMaxExtentSparse" | 453 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 |
78 | 454 | _supported_fmt qcow2 | |
79 | diff --git a/tests/qemu-iotests/120 b/tests/qemu-iotests/120 | 455 | _supported_proto file |
80 | index XXXXXXX..XXXXXXX 100755 | 456 | _supported_os Linux |
81 | --- a/tests/qemu-iotests/120 | 457 | -# This test directly modifies a refblock so it relies on refcount_bits being 16 |
82 | +++ b/tests/qemu-iotests/120 | 458 | -_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' |
83 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | 459 | +# This test directly modifies a refblock so it relies on refcount_bits being 16; |
84 | _supported_fmt generic | 460 | +# and the low-level modification it performs are not tuned for external data |
85 | _supported_proto file | 461 | +# files |
86 | _unsupported_fmt luks | 462 | +_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file |
87 | +_require_drivers raw | 463 | |
88 | 464 | echo | |
89 | _make_test_img 64M | 465 | echo '=== Repairing an image without any refcount table ===' |
90 | 466 | diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112 | |
91 | diff --git a/tests/qemu-iotests/162 b/tests/qemu-iotests/162 | 467 | index XXXXXXX..XXXXXXX 100755 |
92 | index XXXXXXX..XXXXXXX 100755 | 468 | --- a/tests/qemu-iotests/112 |
93 | --- a/tests/qemu-iotests/162 | 469 | +++ b/tests/qemu-iotests/112 |
94 | +++ b/tests/qemu-iotests/162 | 470 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 |
95 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | 471 | _supported_fmt qcow2 |
96 | . ./common.filter | 472 | _supported_proto file |
97 | 473 | # This test will set refcount_bits on its own which would conflict with the | |
98 | _supported_fmt generic | 474 | -# manual setting; compat will be overridden as well |
99 | - | 475 | -_unsupported_imgopts refcount_bits 'compat=0.10' |
100 | -test_ssh=$($QEMU_IMG --help | grep '^Supported formats:.* ssh\( \|$\)') | 476 | +# manual setting; compat will be overridden as well; |
101 | -[ "$test_ssh" = "" ] && _notrun "ssh support required" | 477 | +# and external data files do not work well with our refcount testing |
102 | +_require_drivers ssh | 478 | +_unsupported_imgopts refcount_bits 'compat=0.10' data_file |
103 | 479 | ||
104 | echo | 480 | print_refcount_bits() |
105 | echo '=== NBD ===' | 481 | { |
106 | diff --git a/tests/qemu-iotests/184 b/tests/qemu-iotests/184 | 482 | diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114 |
107 | index XXXXXXX..XXXXXXX 100755 | 483 | index XXXXXXX..XXXXXXX 100755 |
108 | --- a/tests/qemu-iotests/184 | 484 | --- a/tests/qemu-iotests/114 |
109 | +++ b/tests/qemu-iotests/184 | 485 | +++ b/tests/qemu-iotests/114 |
110 | @@ -XXX,XX +XXX,XX @@ trap "exit \$status" 0 1 2 3 15 | 486 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 |
111 | . ./common.filter | 487 | _supported_fmt qcow2 |
112 | 488 | _supported_proto generic | |
113 | _supported_os Linux | 489 | _unsupported_proto vxhs |
114 | +_require_drivers throttle | 490 | +# qcow2.py does not work too well with external data files |
491 | +_unsupported_imgopts data_file | ||
492 | |||
493 | |||
494 | TEST_IMG="$TEST_IMG.base" _make_test_img 64M | ||
495 | diff --git a/tests/qemu-iotests/121 b/tests/qemu-iotests/121 | ||
496 | index XXXXXXX..XXXXXXX 100755 | ||
497 | --- a/tests/qemu-iotests/121 | ||
498 | +++ b/tests/qemu-iotests/121 | ||
499 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
500 | _supported_fmt qcow2 | ||
501 | _supported_proto file | ||
502 | _supported_os Linux | ||
503 | +# Refcount structures are used much differently with external data | ||
504 | +# files | ||
505 | +_unsupported_imgopts data_file | ||
506 | |||
507 | echo | ||
508 | echo '=== New refcount structures may not conflict with existing structures ===' | ||
509 | diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138 | ||
510 | index XXXXXXX..XXXXXXX 100755 | ||
511 | --- a/tests/qemu-iotests/138 | ||
512 | +++ b/tests/qemu-iotests/138 | ||
513 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
514 | _supported_fmt qcow2 | ||
515 | _supported_proto file | ||
516 | _supported_os Linux | ||
517 | +# With an external data file, data clusters are not refcounted | ||
518 | +# (and so qemu-img check does not check their refcount) | ||
519 | +_unsupported_imgopts data_file | ||
520 | |||
521 | echo | ||
522 | echo '=== Check on an image with a multiple of 2^32 clusters ===' | ||
523 | diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156 | ||
524 | index XXXXXXX..XXXXXXX 100755 | ||
525 | --- a/tests/qemu-iotests/156 | ||
526 | +++ b/tests/qemu-iotests/156 | ||
527 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
528 | _supported_fmt qcow2 qed | ||
529 | _supported_proto generic | ||
530 | _unsupported_proto vxhs | ||
531 | +# Copying files around with cp does not work with external data files | ||
532 | +_unsupported_imgopts data_file | ||
533 | |||
534 | # Create source disk | ||
535 | TEST_IMG="$TEST_IMG.backing" _make_test_img 1M | ||
536 | diff --git a/tests/qemu-iotests/176 b/tests/qemu-iotests/176 | ||
537 | index XXXXXXX..XXXXXXX 100755 | ||
538 | --- a/tests/qemu-iotests/176 | ||
539 | +++ b/tests/qemu-iotests/176 | ||
540 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
541 | _supported_fmt qcow2 | ||
542 | _supported_proto file | ||
543 | _supported_os Linux | ||
544 | -# Persistent dirty bitmaps require compat=1.1 | ||
545 | -_unsupported_imgopts 'compat=0.10' | ||
546 | +# Persistent dirty bitmaps require compat=1.1; | ||
547 | +# Internal snapshots forbid using an external data file | ||
548 | +# (they work with refcount_bits=1 here, though, because there actually | ||
549 | +# is no data when creating the snapshot) | ||
550 | +_unsupported_imgopts 'compat=0.10' data_file | ||
551 | |||
552 | run_qemu() | ||
553 | { | ||
554 | diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191 | ||
555 | index XXXXXXX..XXXXXXX 100755 | ||
556 | --- a/tests/qemu-iotests/191 | ||
557 | +++ b/tests/qemu-iotests/191 | ||
558 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
559 | |||
560 | _supported_fmt qcow2 | ||
561 | _supported_proto file | ||
562 | +# An external data file would change the query-named-block-nodes output | ||
563 | +_unsupported_imgopts data_file | ||
564 | |||
565 | size=64M | ||
566 | |||
567 | diff --git a/tests/qemu-iotests/201 b/tests/qemu-iotests/201 | ||
568 | index XXXXXXX..XXXXXXX 100755 | ||
569 | --- a/tests/qemu-iotests/201 | ||
570 | +++ b/tests/qemu-iotests/201 | ||
571 | @@ -XXX,XX +XXX,XX @@ _supported_fmt qcow2 | ||
572 | _supported_proto generic | ||
573 | _supported_os Linux | ||
574 | |||
575 | -# Internal snapshots are (currently) impossible with refcount_bits=1 | ||
576 | -# This was taken from test 080 | ||
577 | -_unsupported_imgopts 'refcount_bits=1[^0-9]' | ||
578 | +# Internal snapshots are (currently) impossible with refcount_bits=1, | ||
579 | +# and generally impossible with external data files | ||
580 | +_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file | ||
581 | |||
582 | size=64M | ||
583 | _make_test_img $size | ||
584 | diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214 | ||
585 | index XXXXXXX..XXXXXXX 100755 | ||
586 | --- a/tests/qemu-iotests/214 | ||
587 | +++ b/tests/qemu-iotests/214 | ||
588 | @@ -XXX,XX +XXX,XX @@ _supported_proto file | ||
589 | |||
590 | # Repairing the corrupted image requires qemu-img check to store a | ||
591 | # refcount up to 3, which requires at least two refcount bits. | ||
592 | -_unsupported_imgopts 'refcount_bits=1[^0-9]' | ||
593 | +# External data files do not support compressed clusters. | ||
594 | +_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file | ||
595 | |||
596 | |||
597 | echo | ||
598 | diff --git a/tests/qemu-iotests/217 b/tests/qemu-iotests/217 | ||
599 | index XXXXXXX..XXXXXXX 100755 | ||
600 | --- a/tests/qemu-iotests/217 | ||
601 | +++ b/tests/qemu-iotests/217 | ||
602 | @@ -XXX,XX +XXX,XX @@ _supported_proto file | ||
603 | |||
604 | # This test needs clusters with at least a refcount of 2 so that | ||
605 | # OFLAG_COPIED is not set. refcount_bits=1 is therefore unsupported. | ||
606 | -_unsupported_imgopts 'refcount_bits=1[^0-9]' | ||
607 | +# (As are external data files.) | ||
608 | +_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file | ||
609 | |||
610 | echo | ||
611 | echo '=== Simulating an I/O error during snapshot deletion ===' | ||
612 | diff --git a/tests/qemu-iotests/220 b/tests/qemu-iotests/220 | ||
613 | index XXXXXXX..XXXXXXX 100755 | ||
614 | --- a/tests/qemu-iotests/220 | ||
615 | +++ b/tests/qemu-iotests/220 | ||
616 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
617 | _supported_fmt qcow2 | ||
618 | _supported_proto file | ||
619 | _supported_os Linux | ||
620 | -# To use a different refcount width but 16 bits we need compat=1.1 | ||
621 | -_unsupported_imgopts 'compat=0.10' | ||
622 | +# To use a different refcount width but 16 bits we need compat=1.1, | ||
623 | +# and external data files do not support compressed clusters. | ||
624 | +_unsupported_imgopts 'compat=0.10' data_file | ||
625 | |||
626 | echo "== Creating huge file ==" | ||
627 | |||
628 | diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243 | ||
629 | index XXXXXXX..XXXXXXX 100755 | ||
630 | --- a/tests/qemu-iotests/243 | ||
631 | +++ b/tests/qemu-iotests/243 | ||
632 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
633 | _supported_fmt qcow2 | ||
634 | _supported_proto file | ||
635 | _supported_os Linux | ||
636 | -# External data files do not work with compat=0.10 | ||
637 | -_unsupported_imgopts 'compat=0.10' | ||
638 | +# External data files do not work with compat=0.10, and because there | ||
639 | +# is an explicit case for external data files here, we cannot allow | ||
640 | +# the user to specify whether to use one | ||
641 | +_unsupported_imgopts 'compat=0.10' data_file | ||
642 | |||
643 | for mode in off metadata falloc full; do | ||
644 | |||
645 | diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244 | ||
646 | index XXXXXXX..XXXXXXX 100755 | ||
647 | --- a/tests/qemu-iotests/244 | ||
648 | +++ b/tests/qemu-iotests/244 | ||
649 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
650 | _supported_fmt qcow2 | ||
651 | _supported_proto file | ||
652 | _supported_os Linux | ||
653 | -# External data files do not work with compat=0.10 | ||
654 | -_unsupported_imgopts 'compat=0.10' | ||
655 | +# External data files do not work with compat=0.10, and because we use | ||
656 | +# our own external data file, we cannot let the user specify one | ||
657 | +_unsupported_imgopts 'compat=0.10' data_file | ||
658 | |||
659 | echo | ||
660 | echo "=== Create and open image with external data file ===" | ||
661 | diff --git a/tests/qemu-iotests/250 b/tests/qemu-iotests/250 | ||
662 | index XXXXXXX..XXXXXXX 100755 | ||
663 | --- a/tests/qemu-iotests/250 | ||
664 | +++ b/tests/qemu-iotests/250 | ||
665 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
666 | _supported_fmt qcow2 | ||
667 | _supported_proto file | ||
668 | _supported_os Linux | ||
669 | +# This test does not make much sense with external data files | ||
670 | +_unsupported_imgopts data_file | ||
671 | |||
672 | # This test checks that qcow2_process_discards does not truncate a discard | ||
673 | # request > 2G. | ||
674 | diff --git a/tests/qemu-iotests/261 b/tests/qemu-iotests/261 | ||
675 | index XXXXXXX..XXXXXXX 100755 | ||
676 | --- a/tests/qemu-iotests/261 | ||
677 | +++ b/tests/qemu-iotests/261 | ||
678 | @@ -XXX,XX +XXX,XX @@ _supported_os Linux | ||
679 | # (1) We create a v2 image that supports nothing but refcount_bits=16 | ||
680 | # (2) We do some refcount management on our own which expects | ||
681 | # refcount_bits=16 | ||
682 | -_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' | ||
683 | +# As for data files, they do not support snapshots at all. | ||
684 | +_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file | ||
685 | |||
686 | # Parameters: | ||
687 | # $1: image filename | ||
688 | diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267 | ||
689 | index XXXXXXX..XXXXXXX 100755 | ||
690 | --- a/tests/qemu-iotests/267 | ||
691 | +++ b/tests/qemu-iotests/267 | ||
692 | @@ -XXX,XX +XXX,XX @@ _supported_proto file | ||
693 | _supported_os Linux | ||
694 | _require_drivers copy-on-read | ||
695 | |||
696 | -# Internal snapshots are (currently) impossible with refcount_bits=1 | ||
697 | -_unsupported_imgopts 'refcount_bits=1[^0-9]' | ||
698 | +# Internal snapshots are (currently) impossible with refcount_bits=1, | ||
699 | +# and generally impossible with external data files | ||
700 | +_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file | ||
115 | 701 | ||
116 | do_run_qemu() | 702 | do_run_qemu() |
117 | { | 703 | { |
118 | diff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186 | 704 | diff --git a/tests/qemu-iotests/273 b/tests/qemu-iotests/273 |
119 | index XXXXXXX..XXXXXXX 100755 | 705 | index XXXXXXX..XXXXXXX 100755 |
120 | --- a/tests/qemu-iotests/186 | 706 | --- a/tests/qemu-iotests/273 |
121 | +++ b/tests/qemu-iotests/186 | 707 | +++ b/tests/qemu-iotests/273 |
122 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | 708 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 |
123 | 709 | _supported_fmt qcow2 | |
124 | _supported_fmt qcow2 | 710 | _supported_proto file |
125 | _supported_proto file | 711 | _supported_os Linux |
126 | +_require_drivers null-co | 712 | +# External data files would add nodes to the block graph, so it would |
127 | 713 | +# not match the reference output | |
128 | if [ "$QEMU_DEFAULT_MACHINE" != "pc" ]; then | 714 | +_unsupported_imgopts data_file |
129 | _notrun "Requires a PC machine" | 715 | |
130 | diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc | 716 | do_run_qemu() |
131 | index XXXXXXX..XXXXXXX 100644 | 717 | { |
132 | --- a/tests/qemu-iotests/common.rc | ||
133 | +++ b/tests/qemu-iotests/common.rc | ||
134 | @@ -XXX,XX +XXX,XX @@ _require_command() | ||
135 | [ -x "$c" ] || _notrun "$1 utility required, skipped this test" | ||
136 | } | ||
137 | |||
138 | +# Check that a set of drivers has been whitelisted in the QEMU binary | ||
139 | +# | ||
140 | +_require_drivers() | ||
141 | +{ | ||
142 | + available=$($QEMU -drive format=help | \ | ||
143 | + sed -e '/Supported formats:/!d' -e 's/Supported formats://') | ||
144 | + for driver | ||
145 | + do | ||
146 | + if ! echo "$available" | grep -q " $driver\( \|$\)"; then | ||
147 | + _notrun "$driver not available" | ||
148 | + fi | ||
149 | + done | ||
150 | +} | ||
151 | + | ||
152 | # make sure this script returns success | ||
153 | true | ||
154 | -- | 718 | -- |
155 | 2.21.0 | 719 | 2.24.1 |
156 | 720 | ||
157 | 721 | diff view generated by jsdifflib |
1 | fe646693acc changed qemu-img create's output so that it no longer prints | 1 | The problem with allowing the data_file option is that you want to use a |
---|---|---|---|
2 | single quotes around parameter values. The subformat and adapter_type | 2 | different data file per image used in the test. Therefore, we need to |
3 | filters in _filter_img_create() have never been adapted to that change. | 3 | allow patterns like -o data_file='$TEST_IMG.data_file'. |
4 | 4 | ||
5 | Fixes: fe646693acc13ac48b98435d14149ab04dc597bc | 5 | Then, we need to filter it out from qemu-img map, qemu-img create, and |
6 | remove the data file in _rm_test_img. | ||
7 | |||
6 | Signed-off-by: Max Reitz <mreitz@redhat.com> | 8 | Signed-off-by: Max Reitz <mreitz@redhat.com> |
7 | Reviewed-by: John Snow <jsnow@redhat.com> | 9 | Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> |
8 | Message-id: 20190815153638.4600-2-mreitz@redhat.com | 10 | Message-id: 20191107163708.833192-23-mreitz@redhat.com |
9 | Reviewed-by: John Snow <jsnow@redhat.com> | ||
10 | Signed-off-by: Max Reitz <mreitz@redhat.com> | 11 | Signed-off-by: Max Reitz <mreitz@redhat.com> |
11 | --- | 12 | --- |
12 | tests/qemu-iotests/059.out | 16 ++++++++-------- | 13 | tests/qemu-iotests/common.filter | 23 +++++++++++++++++++++-- |
13 | tests/qemu-iotests/common.filter | 4 ++-- | 14 | tests/qemu-iotests/common.rc | 22 +++++++++++++++++++++- |
14 | 2 files changed, 10 insertions(+), 10 deletions(-) | 15 | 2 files changed, 42 insertions(+), 3 deletions(-) |
15 | 16 | ||
16 | diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out | ||
17 | index XXXXXXX..XXXXXXX 100644 | ||
18 | --- a/tests/qemu-iotests/059.out | ||
19 | +++ b/tests/qemu-iotests/059.out | ||
20 | @@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 | ||
21 | qemu-io: can't open device TEST_DIR/t.vmdk: L1 size too big | ||
22 | |||
23 | === Testing monolithicFlat creation and opening === | ||
24 | -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648 subformat=monolithicFlat | ||
25 | +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648 | ||
26 | image: TEST_DIR/t.IMGFMT | ||
27 | file format: IMGFMT | ||
28 | virtual size: 2 GiB (2147483648 bytes) | ||
29 | |||
30 | === Testing monolithicFlat with zeroed_grain === | ||
31 | qemu-img: TEST_DIR/t.IMGFMT: Flat image can't enable zeroed grain | ||
32 | -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648 subformat=monolithicFlat | ||
33 | +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2147483648 | ||
34 | |||
35 | === Testing big twoGbMaxExtentFlat === | ||
36 | -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824000 subformat=twoGbMaxExtentFlat | ||
37 | +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824000 | ||
38 | image: TEST_DIR/t.vmdk | ||
39 | file format: vmdk | ||
40 | virtual size: 0.977 TiB (1073741824000 bytes) | ||
41 | @@ -XXX,XX +XXX,XX @@ Format specific information: | ||
42 | qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Invalid extent line: RW 12582912 VMFS "dummy.IMGFMT" 1 | ||
43 | |||
44 | === Testing truncated sparse === | ||
45 | -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=107374182400 subformat=monolithicSparse | ||
46 | +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=107374182400 | ||
47 | qemu-img: Could not open 'TEST_DIR/t.IMGFMT': File truncated, expecting at least 13172736 bytes | ||
48 | |||
49 | === Converting to streamOptimized from image with small cluster size=== | ||
50 | @@ -XXX,XX +XXX,XX @@ wrote 512/512 bytes at offset 10240 | ||
51 | 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
52 | |||
53 | === Testing monolithicFlat with internally generated JSON file name === | ||
54 | -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 subformat=monolithicFlat | ||
55 | +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 | ||
56 | qemu-io: can't open: Cannot use relative extent paths with VMDK descriptor file 'json:{"image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "driver": "blkdebug", "inject-error.0.event": "read_aio"}' | ||
57 | |||
58 | === Testing version 3 === | ||
59 | @@ -XXX,XX +XXX,XX @@ read 512/512 bytes at offset 64931328 | ||
60 | 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
61 | |||
62 | === Testing 4TB monolithicFlat creation and IO === | ||
63 | -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4398046511104 subformat=monolithicFlat | ||
64 | +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4398046511104 | ||
65 | image: TEST_DIR/t.IMGFMT | ||
66 | file format: IMGFMT | ||
67 | virtual size: 4 TiB (4398046511104 bytes) | ||
68 | @@ -XXX,XX +XXX,XX @@ read 1024/1024 bytes at offset 966367641600 | ||
69 | 1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
70 | |||
71 | === Testing qemu-img map on extents === | ||
72 | -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=33285996544 subformat=monolithicSparse | ||
73 | +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=33285996544 | ||
74 | wrote 1024/1024 bytes at offset 65024 | ||
75 | 1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
76 | wrote 1024/1024 bytes at offset 2147483136 | ||
77 | @@ -XXX,XX +XXX,XX @@ Offset Length Mapped to File | ||
78 | 0 0x20000 0x3f0000 TEST_DIR/t.vmdk | ||
79 | 0x7fff0000 0x20000 0x410000 TEST_DIR/t.vmdk | ||
80 | 0x140000000 0x10000 0x430000 TEST_DIR/t.vmdk | ||
81 | -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=33285996544 subformat=twoGbMaxExtentSparse | ||
82 | +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=33285996544 | ||
83 | wrote 1024/1024 bytes at offset 65024 | ||
84 | 1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
85 | wrote 1024/1024 bytes at offset 2147483136 | ||
86 | diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter | 17 | diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter |
87 | index XXXXXXX..XXXXXXX 100644 | 18 | index XXXXXXX..XXXXXXX 100644 |
88 | --- a/tests/qemu-iotests/common.filter | 19 | --- a/tests/qemu-iotests/common.filter |
89 | +++ b/tests/qemu-iotests/common.filter | 20 | +++ b/tests/qemu-iotests/common.filter |
90 | @@ -XXX,XX +XXX,XX @@ _filter_img_create() | 21 | @@ -XXX,XX +XXX,XX @@ _filter_actual_image_size() |
91 | -e "s# compat6=\\(on\\|off\\)##g" \ | 22 | # replace driver-specific options in the "Formatting..." line |
92 | -e "s# static=\\(on\\|off\\)##g" \ | 23 | _filter_img_create() |
93 | -e "s# zeroed_grain=\\(on\\|off\\)##g" \ | 24 | { |
94 | - -e "s# subformat='[^']*'##g" \ | 25 | - $SED -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \ |
95 | - -e "s# adapter_type='[^']*'##g" \ | 26 | + data_file_filter=() |
96 | + -e "s# subformat=[^ ]*##g" \ | 27 | + if data_file=$(_get_data_file "$TEST_IMG"); then |
97 | + -e "s# adapter_type=[^ ]*##g" \ | 28 | + data_file_filter=(-e "s# data_file=$data_file##") |
98 | -e "s# hwversion=[^ ]*##g" \ | 29 | + fi |
99 | -e "s# lazy_refcounts=\\(on\\|off\\)##g" \ | 30 | + |
100 | -e "s# block_size=[0-9]\\+##g" \ | 31 | + $SED "${data_file_filter[@]}" \ |
32 | + -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \ | ||
33 | -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \ | ||
34 | -e "s#$TEST_DIR#TEST_DIR#g" \ | ||
35 | -e "s#$SOCK_DIR#SOCK_DIR#g" \ | ||
36 | @@ -XXX,XX +XXX,XX @@ _filter_img_info() | ||
37 | # human and json output | ||
38 | _filter_qemu_img_map() | ||
39 | { | ||
40 | + # Assuming the data_file value in $IMGOPTS contains a '$TEST_IMG', | ||
41 | + # create a filter that replaces the data file name by $TEST_IMG. | ||
42 | + # Example: | ||
43 | + # In $IMGOPTS: 'data_file=$TEST_IMG.data_file' | ||
44 | + # Then data_file_pattern == '\(.*\).data_file' | ||
45 | + # And data_file_filter == -e 's#\(.*\).data_file#\1# | ||
46 | + data_file_filter=() | ||
47 | + if data_file_pattern=$(_get_data_file '\\(.*\\)'); then | ||
48 | + data_file_filter=(-e "s#$data_file_pattern#\\1#") | ||
49 | + fi | ||
50 | + | ||
51 | $SED -e 's/\([0-9a-fx]* *[0-9a-fx]* *\)[0-9a-fx]* */\1/g' \ | ||
52 | -e 's/"offset": [0-9]\+/"offset": OFFSET/g' \ | ||
53 | - -e 's/Mapped to *//' | _filter_testdir | _filter_imgfmt | ||
54 | + -e 's/Mapped to *//' \ | ||
55 | + "${data_file_filter[@]}" \ | ||
56 | + | _filter_testdir | _filter_imgfmt | ||
57 | } | ||
58 | |||
59 | _filter_nbd() | ||
60 | diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc | ||
61 | index XXXXXXX..XXXXXXX 100644 | ||
62 | --- a/tests/qemu-iotests/common.rc | ||
63 | +++ b/tests/qemu-iotests/common.rc | ||
64 | @@ -XXX,XX +XXX,XX @@ _stop_nbd_server() | ||
65 | fi | ||
66 | } | ||
67 | |||
68 | +# Gets the data_file value from IMGOPTS and replaces the '$TEST_IMG' | ||
69 | +# pattern by '$1' | ||
70 | +# Caution: The replacement is done with sed, so $1 must be escaped | ||
71 | +# properly. (The delimiter is '#'.) | ||
72 | +_get_data_file() | ||
73 | +{ | ||
74 | + if ! echo "$IMGOPTS" | grep -q 'data_file='; then | ||
75 | + return 1 | ||
76 | + fi | ||
77 | + | ||
78 | + echo "$IMGOPTS" | sed -e 's/.*data_file=\([^,]*\).*/\1/' \ | ||
79 | + | sed -e "s#\\\$TEST_IMG#$1#" | ||
80 | +} | ||
81 | + | ||
82 | _make_test_img() | ||
83 | { | ||
84 | # extra qemu-img options can be added by tests | ||
85 | @@ -XXX,XX +XXX,XX @@ _make_test_img() | ||
86 | fi | ||
87 | |||
88 | if [ -n "$IMGOPTS" ]; then | ||
89 | - optstr=$(_optstr_add "$optstr" "$IMGOPTS") | ||
90 | + imgopts_expanded=$(echo "$IMGOPTS" | sed -e "s#\\\$TEST_IMG#$img_name#") | ||
91 | + optstr=$(_optstr_add "$optstr" "$imgopts_expanded") | ||
92 | fi | ||
93 | if [ -n "$IMGKEYSECRET" ]; then | ||
94 | object_options="--object secret,id=keysec0,data=$IMGKEYSECRET" | ||
95 | @@ -XXX,XX +XXX,XX @@ _rm_test_img() | ||
96 | # Remove all the extents for vmdk | ||
97 | "$QEMU_IMG" info "$img" 2>/dev/null | grep 'filename:' | cut -f 2 -d: \ | ||
98 | | xargs -I {} rm -f "{}" | ||
99 | + elif [ "$IMGFMT" = "qcow2" ]; then | ||
100 | + # Remove external data file | ||
101 | + if data_file=$(_get_data_file "$img"); then | ||
102 | + rm -f "$data_file" | ||
103 | + fi | ||
104 | fi | ||
105 | rm -f "$img" | ||
106 | } | ||
101 | -- | 107 | -- |
102 | 2.21.0 | 108 | 2.24.1 |
103 | 109 | ||
104 | 110 | diff view generated by jsdifflib |
New patch | |||
---|---|---|---|
1 | 1 | From: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com> | |
2 | |||
3 | Allow writing all the data compressed through the filter driver. | ||
4 | The written data will be aligned by the cluster size. | ||
5 | Based on the QEMU current implementation, that data can be written to | ||
6 | unallocated clusters only. May be used for a backup job. | ||
7 | |||
8 | Suggested-by: Max Reitz <mreitz@redhat.com> | ||
9 | Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com> | ||
10 | Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> | ||
11 | Message-id: 1575288906-551879-2-git-send-email-andrey.shinkevich@virtuozzo.com | ||
12 | [mreitz: Replace NULL bdrv_get_format_name() by "(no format)"] | ||
13 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
14 | --- | ||
15 | block/Makefile.objs | 1 + | ||
16 | block/filter-compress.c | 168 ++++++++++++++++++++++++++++++++++++++++ | ||
17 | qapi/block-core.json | 10 ++- | ||
18 | 3 files changed, 175 insertions(+), 4 deletions(-) | ||
19 | create mode 100644 block/filter-compress.c | ||
20 | |||
21 | diff --git a/block/Makefile.objs b/block/Makefile.objs | ||
22 | index XXXXXXX..XXXXXXX 100644 | ||
23 | --- a/block/Makefile.objs | ||
24 | +++ b/block/Makefile.objs | ||
25 | @@ -XXX,XX +XXX,XX @@ block-obj-y += crypto.o | ||
26 | |||
27 | block-obj-y += aio_task.o | ||
28 | block-obj-y += backup-top.o | ||
29 | +block-obj-y += filter-compress.o | ||
30 | |||
31 | common-obj-y += stream.o | ||
32 | |||
33 | diff --git a/block/filter-compress.c b/block/filter-compress.c | ||
34 | new file mode 100644 | ||
35 | index XXXXXXX..XXXXXXX | ||
36 | --- /dev/null | ||
37 | +++ b/block/filter-compress.c | ||
38 | @@ -XXX,XX +XXX,XX @@ | ||
39 | +/* | ||
40 | + * Compress filter block driver | ||
41 | + * | ||
42 | + * Copyright (c) 2019 Virtuozzo International GmbH | ||
43 | + * | ||
44 | + * Author: | ||
45 | + * Andrey Shinkevich <andrey.shinkevich@virtuozzo.com> | ||
46 | + * (based on block/copy-on-read.c by Max Reitz) | ||
47 | + * | ||
48 | + * This program is free software; you can redistribute it and/or | ||
49 | + * modify it under the terms of the GNU General Public License as | ||
50 | + * published by the Free Software Foundation; either version 2 or | ||
51 | + * (at your option) any later version of the License. | ||
52 | + * | ||
53 | + * This program is distributed in the hope that it will be useful, | ||
54 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
55 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
56 | + * GNU General Public License for more details. | ||
57 | + * | ||
58 | + * You should have received a copy of the GNU General Public License | ||
59 | + * along with this program; if not, see <http://www.gnu.org/licenses/>. | ||
60 | + */ | ||
61 | + | ||
62 | +#include "qemu/osdep.h" | ||
63 | +#include "block/block_int.h" | ||
64 | +#include "qemu/module.h" | ||
65 | +#include "qapi/error.h" | ||
66 | + | ||
67 | + | ||
68 | +static int compress_open(BlockDriverState *bs, QDict *options, int flags, | ||
69 | + Error **errp) | ||
70 | +{ | ||
71 | + bs->file = bdrv_open_child(NULL, options, "file", bs, &child_file, false, | ||
72 | + errp); | ||
73 | + if (!bs->file) { | ||
74 | + return -EINVAL; | ||
75 | + } | ||
76 | + | ||
77 | + if (!bs->file->bs->drv || !block_driver_can_compress(bs->file->bs->drv)) { | ||
78 | + error_setg(errp, | ||
79 | + "Compression is not supported for underlying format: %s", | ||
80 | + bdrv_get_format_name(bs->file->bs) ?: "(no format)"); | ||
81 | + | ||
82 | + return -ENOTSUP; | ||
83 | + } | ||
84 | + | ||
85 | + bs->supported_write_flags = BDRV_REQ_WRITE_UNCHANGED | | ||
86 | + (BDRV_REQ_FUA & bs->file->bs->supported_write_flags); | ||
87 | + | ||
88 | + bs->supported_zero_flags = BDRV_REQ_WRITE_UNCHANGED | | ||
89 | + ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) & | ||
90 | + bs->file->bs->supported_zero_flags); | ||
91 | + | ||
92 | + return 0; | ||
93 | +} | ||
94 | + | ||
95 | + | ||
96 | +static int64_t compress_getlength(BlockDriverState *bs) | ||
97 | +{ | ||
98 | + return bdrv_getlength(bs->file->bs); | ||
99 | +} | ||
100 | + | ||
101 | + | ||
102 | +static int coroutine_fn compress_co_preadv_part(BlockDriverState *bs, | ||
103 | + uint64_t offset, uint64_t bytes, | ||
104 | + QEMUIOVector *qiov, | ||
105 | + size_t qiov_offset, | ||
106 | + int flags) | ||
107 | +{ | ||
108 | + return bdrv_co_preadv_part(bs->file, offset, bytes, qiov, qiov_offset, | ||
109 | + flags); | ||
110 | +} | ||
111 | + | ||
112 | + | ||
113 | +static int coroutine_fn compress_co_pwritev_part(BlockDriverState *bs, | ||
114 | + uint64_t offset, | ||
115 | + uint64_t bytes, | ||
116 | + QEMUIOVector *qiov, | ||
117 | + size_t qiov_offset, int flags) | ||
118 | +{ | ||
119 | + return bdrv_co_pwritev_part(bs->file, offset, bytes, qiov, qiov_offset, | ||
120 | + flags | BDRV_REQ_WRITE_COMPRESSED); | ||
121 | +} | ||
122 | + | ||
123 | + | ||
124 | +static int coroutine_fn compress_co_pwrite_zeroes(BlockDriverState *bs, | ||
125 | + int64_t offset, int bytes, | ||
126 | + BdrvRequestFlags flags) | ||
127 | +{ | ||
128 | + return bdrv_co_pwrite_zeroes(bs->file, offset, bytes, flags); | ||
129 | +} | ||
130 | + | ||
131 | + | ||
132 | +static int coroutine_fn compress_co_pdiscard(BlockDriverState *bs, | ||
133 | + int64_t offset, int bytes) | ||
134 | +{ | ||
135 | + return bdrv_co_pdiscard(bs->file, offset, bytes); | ||
136 | +} | ||
137 | + | ||
138 | + | ||
139 | +static void compress_refresh_limits(BlockDriverState *bs, Error **errp) | ||
140 | +{ | ||
141 | + BlockDriverInfo bdi; | ||
142 | + int ret; | ||
143 | + | ||
144 | + if (!bs->file) { | ||
145 | + return; | ||
146 | + } | ||
147 | + | ||
148 | + ret = bdrv_get_info(bs->file->bs, &bdi); | ||
149 | + if (ret < 0 || bdi.cluster_size == 0) { | ||
150 | + return; | ||
151 | + } | ||
152 | + | ||
153 | + bs->bl.request_alignment = bdi.cluster_size; | ||
154 | +} | ||
155 | + | ||
156 | + | ||
157 | +static void compress_eject(BlockDriverState *bs, bool eject_flag) | ||
158 | +{ | ||
159 | + bdrv_eject(bs->file->bs, eject_flag); | ||
160 | +} | ||
161 | + | ||
162 | + | ||
163 | +static void compress_lock_medium(BlockDriverState *bs, bool locked) | ||
164 | +{ | ||
165 | + bdrv_lock_medium(bs->file->bs, locked); | ||
166 | +} | ||
167 | + | ||
168 | + | ||
169 | +static bool compress_recurse_is_first_non_filter(BlockDriverState *bs, | ||
170 | + BlockDriverState *candidate) | ||
171 | +{ | ||
172 | + return bdrv_recurse_is_first_non_filter(bs->file->bs, candidate); | ||
173 | +} | ||
174 | + | ||
175 | + | ||
176 | +static BlockDriver bdrv_compress = { | ||
177 | + .format_name = "compress", | ||
178 | + | ||
179 | + .bdrv_open = compress_open, | ||
180 | + .bdrv_child_perm = bdrv_filter_default_perms, | ||
181 | + | ||
182 | + .bdrv_getlength = compress_getlength, | ||
183 | + | ||
184 | + .bdrv_co_preadv_part = compress_co_preadv_part, | ||
185 | + .bdrv_co_pwritev_part = compress_co_pwritev_part, | ||
186 | + .bdrv_co_pwrite_zeroes = compress_co_pwrite_zeroes, | ||
187 | + .bdrv_co_pdiscard = compress_co_pdiscard, | ||
188 | + .bdrv_refresh_limits = compress_refresh_limits, | ||
189 | + | ||
190 | + .bdrv_eject = compress_eject, | ||
191 | + .bdrv_lock_medium = compress_lock_medium, | ||
192 | + | ||
193 | + .bdrv_co_block_status = bdrv_co_block_status_from_file, | ||
194 | + | ||
195 | + .bdrv_recurse_is_first_non_filter = compress_recurse_is_first_non_filter, | ||
196 | + | ||
197 | + .has_variable_length = true, | ||
198 | + .is_filter = true, | ||
199 | +}; | ||
200 | + | ||
201 | +static void bdrv_compress_init(void) | ||
202 | +{ | ||
203 | + bdrv_register(&bdrv_compress); | ||
204 | +} | ||
205 | + | ||
206 | +block_init(bdrv_compress_init); | ||
207 | diff --git a/qapi/block-core.json b/qapi/block-core.json | ||
208 | index XXXXXXX..XXXXXXX 100644 | ||
209 | --- a/qapi/block-core.json | ||
210 | +++ b/qapi/block-core.json | ||
211 | @@ -XXX,XX +XXX,XX @@ | ||
212 | # @copy-on-read: Since 3.0 | ||
213 | # @blklogwrites: Since 3.0 | ||
214 | # @blkreplay: Since 4.2 | ||
215 | +# @compress: Since 5.0 | ||
216 | # | ||
217 | # Since: 2.9 | ||
218 | ## | ||
219 | { 'enum': 'BlockdevDriver', | ||
220 | 'data': [ 'blkdebug', 'blklogwrites', 'blkreplay', 'blkverify', 'bochs', | ||
221 | - 'cloop', 'copy-on-read', 'dmg', 'file', 'ftp', 'ftps', 'gluster', | ||
222 | - 'host_cdrom', 'host_device', 'http', 'https', 'iscsi', 'luks', | ||
223 | - 'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels', 'qcow', | ||
224 | - 'qcow2', 'qed', 'quorum', 'raw', 'rbd', | ||
225 | + 'cloop', 'compress', 'copy-on-read', 'dmg', 'file', 'ftp', 'ftps', | ||
226 | + 'gluster', 'host_cdrom', 'host_device', 'http', 'https', 'iscsi', | ||
227 | + 'luks', 'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels', | ||
228 | + 'qcow', 'qcow2', 'qed', 'quorum', 'raw', 'rbd', | ||
229 | { 'name': 'replication', 'if': 'defined(CONFIG_REPLICATION)' }, | ||
230 | 'sheepdog', | ||
231 | 'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] } | ||
232 | @@ -XXX,XX +XXX,XX @@ | ||
233 | 'blkreplay': 'BlockdevOptionsBlkreplay', | ||
234 | 'bochs': 'BlockdevOptionsGenericFormat', | ||
235 | 'cloop': 'BlockdevOptionsGenericFormat', | ||
236 | + 'compress': 'BlockdevOptionsGenericFormat', | ||
237 | 'copy-on-read':'BlockdevOptionsGenericFormat', | ||
238 | 'dmg': 'BlockdevOptionsGenericFormat', | ||
239 | 'file': 'BlockdevOptionsFile', | ||
240 | -- | ||
241 | 2.24.1 | ||
242 | |||
243 | diff view generated by jsdifflib |
1 | From: Nir Soffer <nirsof@gmail.com> | 1 | From: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com> |
---|---|---|---|
2 | 2 | ||
3 | When creating an image with preallocation "off" or "falloc", the first | 3 | QEMU currently supports writing compressed data of the size equal to |
4 | block of the image is typically not allocated. When using Gluster | 4 | one cluster. This patch allows writing QCOW2 compressed data that |
5 | storage backed by XFS filesystem, reading this block using direct I/O | 5 | exceed one cluster. Now, we split buffered data into separate clusters |
6 | succeeds regardless of request length, fooling alignment detection. | 6 | and write them compressed using the block/aio_task API. |
7 | 7 | ||
8 | In this case we fallback to a safe value (4096) instead of the optimal | 8 | Suggested-by: Pavel Butsykin <pbutsykin@virtuozzo.com> |
9 | value (512), which may lead to unneeded data copying when aligning | 9 | Suggested-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> |
10 | requests. Allocating the first block avoids the fallback. | 10 | Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com> |
11 | 11 | Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> | |
12 | Since we allocate the first block even with preallocation=off, we no | ||
13 | longer create images with zero disk size: | ||
14 | |||
15 | $ ./qemu-img create -f raw test.raw 1g | ||
16 | Formatting 'test.raw', fmt=raw size=1073741824 | ||
17 | |||
18 | $ ls -lhs test.raw | ||
19 | 4.0K -rw-r--r--. 1 nsoffer nsoffer 1.0G Aug 16 23:48 test.raw | ||
20 | |||
21 | And converting the image requires additional cluster: | ||
22 | |||
23 | $ ./qemu-img measure -f raw -O qcow2 test.raw | ||
24 | required size: 458752 | ||
25 | fully allocated size: 1074135040 | ||
26 | |||
27 | When using format like vmdk with multiple files per image, we allocate | ||
28 | one block per file: | ||
29 | |||
30 | $ ./qemu-img create -f vmdk -o subformat=twoGbMaxExtentFlat test.vmdk 4g | ||
31 | Formatting 'test.vmdk', fmt=vmdk size=4294967296 compat6=off hwversion=undefined subformat=twoGbMaxExtentFlat | ||
32 | |||
33 | $ ls -lhs test*.vmdk | ||
34 | 4.0K -rw-r--r--. 1 nsoffer nsoffer 2.0G Aug 27 03:23 test-f001.vmdk | ||
35 | 4.0K -rw-r--r--. 1 nsoffer nsoffer 2.0G Aug 27 03:23 test-f002.vmdk | ||
36 | 4.0K -rw-r--r--. 1 nsoffer nsoffer 353 Aug 27 03:23 test.vmdk | ||
37 | |||
38 | I did quick performance test for copying disks with qemu-img convert to | ||
39 | new raw target image to Gluster storage with sector size of 512 bytes: | ||
40 | |||
41 | for i in $(seq 10); do | ||
42 | rm -f dst.raw | ||
43 | sleep 10 | ||
44 | time ./qemu-img convert -f raw -O raw -t none -T none src.raw dst.raw | ||
45 | done | ||
46 | |||
47 | Here is a table comparing the total time spent: | ||
48 | |||
49 | Type Before(s) After(s) Diff(%) | ||
50 | --------------------------------------- | ||
51 | real 530.028 469.123 -11.4 | ||
52 | user 17.204 10.768 -37.4 | ||
53 | sys 17.881 7.011 -60.7 | ||
54 | |||
55 | We can see very clear improvement in CPU usage. | ||
56 | |||
57 | Signed-off-by: Nir Soffer <nsoffer@redhat.com> | ||
58 | Message-id: 20190827010528.8818-2-nsoffer@redhat.com | ||
59 | Reviewed-by: Max Reitz <mreitz@redhat.com> | 12 | Reviewed-by: Max Reitz <mreitz@redhat.com> |
13 | Message-id: 1575288906-551879-3-git-send-email-andrey.shinkevich@virtuozzo.com | ||
60 | Signed-off-by: Max Reitz <mreitz@redhat.com> | 14 | Signed-off-by: Max Reitz <mreitz@redhat.com> |
61 | --- | 15 | --- |
62 | block/file-posix.c | 51 +++++++++++++++++++ | 16 | block/qcow2.c | 102 +++++++++++++++++++++++++++++++++++++------------- |
63 | tests/qemu-iotests/059.out | 2 +- | 17 | 1 file changed, 75 insertions(+), 27 deletions(-) |
64 | tests/qemu-iotests/{150.out => 150.out.qcow2} | 0 | ||
65 | tests/qemu-iotests/150.out.raw | 12 +++++ | ||
66 | tests/qemu-iotests/175 | 19 ++++--- | ||
67 | tests/qemu-iotests/175.out | 8 +-- | ||
68 | tests/qemu-iotests/178.out.qcow2 | 4 +- | ||
69 | tests/qemu-iotests/221.out | 12 +++-- | ||
70 | tests/qemu-iotests/253.out | 12 +++-- | ||
71 | 9 files changed, 99 insertions(+), 21 deletions(-) | ||
72 | rename tests/qemu-iotests/{150.out => 150.out.qcow2} (100%) | ||
73 | create mode 100644 tests/qemu-iotests/150.out.raw | ||
74 | 18 | ||
75 | diff --git a/block/file-posix.c b/block/file-posix.c | 19 | diff --git a/block/qcow2.c b/block/qcow2.c |
76 | index XXXXXXX..XXXXXXX 100644 | 20 | index XXXXXXX..XXXXXXX 100644 |
77 | --- a/block/file-posix.c | 21 | --- a/block/qcow2.c |
78 | +++ b/block/file-posix.c | 22 | +++ b/block/qcow2.c |
79 | @@ -XXX,XX +XXX,XX @@ static int handle_aiocb_discard(void *opaque) | 23 | @@ -XXX,XX +XXX,XX @@ fail: |
80 | return ret; | 24 | return ret; |
81 | } | 25 | } |
82 | 26 | ||
27 | -/* XXX: put compressed sectors first, then all the cluster aligned | ||
28 | - tables to avoid losing bytes in alignment */ | ||
29 | static coroutine_fn int | ||
30 | -qcow2_co_pwritev_compressed_part(BlockDriverState *bs, | ||
31 | +qcow2_co_pwritev_compressed_task(BlockDriverState *bs, | ||
32 | uint64_t offset, uint64_t bytes, | ||
33 | QEMUIOVector *qiov, size_t qiov_offset) | ||
34 | { | ||
35 | @@ -XXX,XX +XXX,XX @@ qcow2_co_pwritev_compressed_part(BlockDriverState *bs, | ||
36 | uint8_t *buf, *out_buf; | ||
37 | uint64_t cluster_offset; | ||
38 | |||
39 | - if (has_data_file(bs)) { | ||
40 | - return -ENOTSUP; | ||
41 | - } | ||
42 | - | ||
43 | - if (bytes == 0) { | ||
44 | - /* align end of file to a sector boundary to ease reading with | ||
45 | - sector based I/Os */ | ||
46 | - int64_t len = bdrv_getlength(bs->file->bs); | ||
47 | - if (len < 0) { | ||
48 | - return len; | ||
49 | - } | ||
50 | - return bdrv_co_truncate(bs->file, len, false, PREALLOC_MODE_OFF, NULL); | ||
51 | - } | ||
52 | - | ||
53 | - if (offset_into_cluster(s, offset)) { | ||
54 | - return -EINVAL; | ||
55 | - } | ||
56 | + assert(bytes == s->cluster_size || (bytes < s->cluster_size && | ||
57 | + (offset + bytes == bs->total_sectors << BDRV_SECTOR_BITS))); | ||
58 | |||
59 | buf = qemu_blockalign(bs, s->cluster_size); | ||
60 | - if (bytes != s->cluster_size) { | ||
61 | - if (bytes > s->cluster_size || | ||
62 | - offset + bytes != bs->total_sectors << BDRV_SECTOR_BITS) | ||
63 | - { | ||
64 | - qemu_vfree(buf); | ||
65 | - return -EINVAL; | ||
66 | - } | ||
67 | + if (bytes < s->cluster_size) { | ||
68 | /* Zero-pad last write if image size is not cluster aligned */ | ||
69 | memset(buf + bytes, 0, s->cluster_size - bytes); | ||
70 | } | ||
71 | @@ -XXX,XX +XXX,XX @@ fail: | ||
72 | return ret; | ||
73 | } | ||
74 | |||
75 | +static coroutine_fn int qcow2_co_pwritev_compressed_task_entry(AioTask *task) | ||
76 | +{ | ||
77 | + Qcow2AioTask *t = container_of(task, Qcow2AioTask, task); | ||
78 | + | ||
79 | + assert(!t->cluster_type && !t->l2meta); | ||
80 | + | ||
81 | + return qcow2_co_pwritev_compressed_task(t->bs, t->offset, t->bytes, t->qiov, | ||
82 | + t->qiov_offset); | ||
83 | +} | ||
84 | + | ||
83 | +/* | 85 | +/* |
84 | + * Help alignment probing by allocating the first block. | 86 | + * XXX: put compressed sectors first, then all the cluster aligned |
85 | + * | 87 | + * tables to avoid losing bytes in alignment |
86 | + * When reading with direct I/O from unallocated area on Gluster backed by XFS, | ||
87 | + * reading succeeds regardless of request length. In this case we fallback to | ||
88 | + * safe alignment which is not optimal. Allocating the first block avoids this | ||
89 | + * fallback. | ||
90 | + * | ||
91 | + * fd may be opened with O_DIRECT, but we don't know the buffer alignment or | ||
92 | + * request alignment, so we use safe values. | ||
93 | + * | ||
94 | + * Returns: 0 on success, -errno on failure. Since this is an optimization, | ||
95 | + * caller may ignore failures. | ||
96 | + */ | 88 | + */ |
97 | +static int allocate_first_block(int fd, size_t max_size) | 89 | +static coroutine_fn int |
90 | +qcow2_co_pwritev_compressed_part(BlockDriverState *bs, | ||
91 | + uint64_t offset, uint64_t bytes, | ||
92 | + QEMUIOVector *qiov, size_t qiov_offset) | ||
98 | +{ | 93 | +{ |
99 | + size_t write_size = (max_size < MAX_BLOCKSIZE) | 94 | + BDRVQcow2State *s = bs->opaque; |
100 | + ? BDRV_SECTOR_SIZE | 95 | + AioTaskPool *aio = NULL; |
101 | + : MAX_BLOCKSIZE; | 96 | + int ret = 0; |
102 | + size_t max_align = MAX(MAX_BLOCKSIZE, getpagesize()); | ||
103 | + void *buf; | ||
104 | + ssize_t n; | ||
105 | + int ret; | ||
106 | + | 97 | + |
107 | + buf = qemu_memalign(max_align, write_size); | 98 | + if (has_data_file(bs)) { |
108 | + memset(buf, 0, write_size); | 99 | + return -ENOTSUP; |
100 | + } | ||
109 | + | 101 | + |
110 | + do { | 102 | + if (bytes == 0) { |
111 | + n = pwrite(fd, buf, write_size, 0); | 103 | + /* |
112 | + } while (n == -1 && errno == EINTR); | 104 | + * align end of file to a sector boundary to ease reading with |
105 | + * sector based I/Os | ||
106 | + */ | ||
107 | + int64_t len = bdrv_getlength(bs->file->bs); | ||
108 | + if (len < 0) { | ||
109 | + return len; | ||
110 | + } | ||
111 | + return bdrv_co_truncate(bs->file, len, false, PREALLOC_MODE_OFF, NULL); | ||
112 | + } | ||
113 | + | 113 | + |
114 | + ret = (n == -1) ? -errno : 0; | 114 | + if (offset_into_cluster(s, offset)) { |
115 | + return -EINVAL; | ||
116 | + } | ||
115 | + | 117 | + |
116 | + qemu_vfree(buf); | 118 | + while (bytes && aio_task_pool_status(aio) == 0) { |
119 | + uint64_t chunk_size = MIN(bytes, s->cluster_size); | ||
120 | + | ||
121 | + if (!aio && chunk_size != bytes) { | ||
122 | + aio = aio_task_pool_new(QCOW2_MAX_WORKERS); | ||
123 | + } | ||
124 | + | ||
125 | + ret = qcow2_add_task(bs, aio, qcow2_co_pwritev_compressed_task_entry, | ||
126 | + 0, 0, offset, chunk_size, qiov, qiov_offset, NULL); | ||
127 | + if (ret < 0) { | ||
128 | + break; | ||
129 | + } | ||
130 | + qiov_offset += chunk_size; | ||
131 | + offset += chunk_size; | ||
132 | + bytes -= chunk_size; | ||
133 | + } | ||
134 | + | ||
135 | + if (aio) { | ||
136 | + aio_task_pool_wait_all(aio); | ||
137 | + if (ret == 0) { | ||
138 | + ret = aio_task_pool_status(aio); | ||
139 | + } | ||
140 | + g_free(aio); | ||
141 | + } | ||
142 | + | ||
117 | + return ret; | 143 | + return ret; |
118 | +} | 144 | +} |
119 | + | 145 | + |
120 | static int handle_aiocb_truncate(void *opaque) | 146 | static int coroutine_fn |
121 | { | 147 | qcow2_co_preadv_compressed(BlockDriverState *bs, |
122 | RawPosixAIOData *aiocb = opaque; | 148 | uint64_t file_cluster_offset, |
123 | @@ -XXX,XX +XXX,XX @@ static int handle_aiocb_truncate(void *opaque) | ||
124 | /* posix_fallocate() doesn't set errno. */ | ||
125 | error_setg_errno(errp, -result, | ||
126 | "Could not preallocate new data"); | ||
127 | + } else if (current_length == 0) { | ||
128 | + /* | ||
129 | + * posix_fallocate() uses fallocate() if the filesystem | ||
130 | + * supports it, or fallback to manually writing zeroes. If | ||
131 | + * fallocate() was used, unaligned reads from the fallocated | ||
132 | + * area in raw_probe_alignment() will succeed, hence we need to | ||
133 | + * allocate the first block. | ||
134 | + * | ||
135 | + * Optimize future alignment probing; ignore failures. | ||
136 | + */ | ||
137 | + allocate_first_block(fd, offset); | ||
138 | } | ||
139 | } else { | ||
140 | result = 0; | ||
141 | @@ -XXX,XX +XXX,XX @@ static int handle_aiocb_truncate(void *opaque) | ||
142 | if (ftruncate(fd, offset) != 0) { | ||
143 | result = -errno; | ||
144 | error_setg_errno(errp, -result, "Could not resize file"); | ||
145 | + } else if (current_length == 0 && offset > current_length) { | ||
146 | + /* Optimize future alignment probing; ignore failures. */ | ||
147 | + allocate_first_block(fd, offset); | ||
148 | } | ||
149 | return result; | ||
150 | default: | ||
151 | diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out | ||
152 | index XXXXXXX..XXXXXXX 100644 | ||
153 | --- a/tests/qemu-iotests/059.out | ||
154 | +++ b/tests/qemu-iotests/059.out | ||
155 | @@ -XXX,XX +XXX,XX @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824000 subformat=twoGbMax | ||
156 | image: TEST_DIR/t.vmdk | ||
157 | file format: vmdk | ||
158 | virtual size: 0.977 TiB (1073741824000 bytes) | ||
159 | -disk size: 16 KiB | ||
160 | +disk size: 1.97 MiB | ||
161 | Format specific information: | ||
162 | cid: XXXXXXXX | ||
163 | parent cid: XXXXXXXX | ||
164 | diff --git a/tests/qemu-iotests/150.out b/tests/qemu-iotests/150.out.qcow2 | ||
165 | similarity index 100% | ||
166 | rename from tests/qemu-iotests/150.out | ||
167 | rename to tests/qemu-iotests/150.out.qcow2 | ||
168 | diff --git a/tests/qemu-iotests/150.out.raw b/tests/qemu-iotests/150.out.raw | ||
169 | new file mode 100644 | ||
170 | index XXXXXXX..XXXXXXX | ||
171 | --- /dev/null | ||
172 | +++ b/tests/qemu-iotests/150.out.raw | ||
173 | @@ -XXX,XX +XXX,XX @@ | ||
174 | +QA output created by 150 | ||
175 | + | ||
176 | +=== Mapping sparse conversion === | ||
177 | + | ||
178 | +Offset Length File | ||
179 | +0 0x1000 TEST_DIR/t.IMGFMT | ||
180 | + | ||
181 | +=== Mapping non-sparse conversion === | ||
182 | + | ||
183 | +Offset Length File | ||
184 | +0 0x100000 TEST_DIR/t.IMGFMT | ||
185 | +*** done | ||
186 | diff --git a/tests/qemu-iotests/175 b/tests/qemu-iotests/175 | ||
187 | index XXXXXXX..XXXXXXX 100755 | ||
188 | --- a/tests/qemu-iotests/175 | ||
189 | +++ b/tests/qemu-iotests/175 | ||
190 | @@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15 | ||
191 | # the file size. This function hides the resulting difference in the | ||
192 | # stat -c '%b' output. | ||
193 | # Parameter 1: Number of blocks an empty file occupies | ||
194 | -# Parameter 2: Image size in bytes | ||
195 | +# Parameter 2: Minimal number of blocks in an image | ||
196 | +# Parameter 3: Image size in bytes | ||
197 | _filter_blocks() | ||
198 | { | ||
199 | extra_blocks=$1 | ||
200 | - img_size=$2 | ||
201 | + min_blocks=$2 | ||
202 | + img_size=$3 | ||
203 | |||
204 | - sed -e "s/blocks=$extra_blocks\\(\$\\|[^0-9]\\)/nothing allocated/" \ | ||
205 | - -e "s/blocks=$((extra_blocks + img_size / 512))\\(\$\\|[^0-9]\\)/everything allocated/" | ||
206 | + sed -e "s/blocks=$min_blocks\\(\$\\|[^0-9]\\)/min allocation/" \ | ||
207 | + -e "s/blocks=$((extra_blocks + img_size / 512))\\(\$\\|[^0-9]\\)/max allocation/" | ||
208 | } | ||
209 | |||
210 | # get standard environment, filters and checks | ||
211 | @@ -XXX,XX +XXX,XX @@ size=$((1 * 1024 * 1024)) | ||
212 | touch "$TEST_DIR/empty" | ||
213 | extra_blocks=$(stat -c '%b' "$TEST_DIR/empty") | ||
214 | |||
215 | +# We always write the first byte; check how many blocks this filesystem | ||
216 | +# allocates to match empty image alloation. | ||
217 | +printf "\0" > "$TEST_DIR/empty" | ||
218 | +min_blocks=$(stat -c '%b' "$TEST_DIR/empty") | ||
219 | + | ||
220 | echo | ||
221 | echo "== creating image with default preallocation ==" | ||
222 | _make_test_img $size | _filter_imgfmt | ||
223 | -stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $size | ||
224 | +stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $min_blocks $size | ||
225 | |||
226 | for mode in off full falloc; do | ||
227 | echo | ||
228 | echo "== creating image with preallocation $mode ==" | ||
229 | IMGOPTS=preallocation=$mode _make_test_img $size | _filter_imgfmt | ||
230 | - stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $size | ||
231 | + stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $min_blocks $size | ||
232 | done | ||
233 | |||
234 | # success, all done | ||
235 | diff --git a/tests/qemu-iotests/175.out b/tests/qemu-iotests/175.out | ||
236 | index XXXXXXX..XXXXXXX 100644 | ||
237 | --- a/tests/qemu-iotests/175.out | ||
238 | +++ b/tests/qemu-iotests/175.out | ||
239 | @@ -XXX,XX +XXX,XX @@ QA output created by 175 | ||
240 | |||
241 | == creating image with default preallocation == | ||
242 | Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 | ||
243 | -size=1048576, nothing allocated | ||
244 | +size=1048576, min allocation | ||
245 | |||
246 | == creating image with preallocation off == | ||
247 | Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 preallocation=off | ||
248 | -size=1048576, nothing allocated | ||
249 | +size=1048576, min allocation | ||
250 | |||
251 | == creating image with preallocation full == | ||
252 | Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 preallocation=full | ||
253 | -size=1048576, everything allocated | ||
254 | +size=1048576, max allocation | ||
255 | |||
256 | == creating image with preallocation falloc == | ||
257 | Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 preallocation=falloc | ||
258 | -size=1048576, everything allocated | ||
259 | +size=1048576, max allocation | ||
260 | *** done | ||
261 | diff --git a/tests/qemu-iotests/178.out.qcow2 b/tests/qemu-iotests/178.out.qcow2 | ||
262 | index XXXXXXX..XXXXXXX 100644 | ||
263 | --- a/tests/qemu-iotests/178.out.qcow2 | ||
264 | +++ b/tests/qemu-iotests/178.out.qcow2 | ||
265 | @@ -XXX,XX +XXX,XX @@ converted image file size in bytes: 196608 | ||
266 | == raw input image with data (human) == | ||
267 | |||
268 | Formatting 'TEST_DIR/t.qcow2', fmt=IMGFMT size=1073741824 | ||
269 | -required size: 393216 | ||
270 | +required size: 458752 | ||
271 | fully allocated size: 1074135040 | ||
272 | wrote 512/512 bytes at offset 512 | ||
273 | 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
274 | @@ -XXX,XX +XXX,XX @@ converted image file size in bytes: 196608 | ||
275 | |||
276 | Formatting 'TEST_DIR/t.qcow2', fmt=IMGFMT size=1073741824 | ||
277 | { | ||
278 | - "required": 393216, | ||
279 | + "required": 458752, | ||
280 | "fully-allocated": 1074135040 | ||
281 | } | ||
282 | wrote 512/512 bytes at offset 512 | ||
283 | diff --git a/tests/qemu-iotests/221.out b/tests/qemu-iotests/221.out | ||
284 | index XXXXXXX..XXXXXXX 100644 | ||
285 | --- a/tests/qemu-iotests/221.out | ||
286 | +++ b/tests/qemu-iotests/221.out | ||
287 | @@ -XXX,XX +XXX,XX @@ QA output created by 221 | ||
288 | === Check mapping of unaligned raw image === | ||
289 | |||
290 | Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=65537 | ||
291 | -[{ "start": 0, "length": 66048, "depth": 0, "zero": true, "data": false, "offset": OFFSET}] | ||
292 | -[{ "start": 0, "length": 66048, "depth": 0, "zero": true, "data": false, "offset": OFFSET}] | ||
293 | +[{ "start": 0, "length": 4096, "depth": 0, "zero": false, "data": true, "offset": OFFSET}, | ||
294 | +{ "start": 4096, "length": 61952, "depth": 0, "zero": true, "data": false, "offset": OFFSET}] | ||
295 | +[{ "start": 0, "length": 4096, "depth": 0, "zero": false, "data": true, "offset": OFFSET}, | ||
296 | +{ "start": 4096, "length": 61952, "depth": 0, "zero": true, "data": false, "offset": OFFSET}] | ||
297 | wrote 1/1 bytes at offset 65536 | ||
298 | 1 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
299 | -[{ "start": 0, "length": 65536, "depth": 0, "zero": true, "data": false, "offset": OFFSET}, | ||
300 | +[{ "start": 0, "length": 4096, "depth": 0, "zero": false, "data": true, "offset": OFFSET}, | ||
301 | +{ "start": 4096, "length": 61440, "depth": 0, "zero": true, "data": false, "offset": OFFSET}, | ||
302 | { "start": 65536, "length": 1, "depth": 0, "zero": false, "data": true, "offset": OFFSET}, | ||
303 | { "start": 65537, "length": 511, "depth": 0, "zero": true, "data": false, "offset": OFFSET}] | ||
304 | -[{ "start": 0, "length": 65536, "depth": 0, "zero": true, "data": false, "offset": OFFSET}, | ||
305 | +[{ "start": 0, "length": 4096, "depth": 0, "zero": false, "data": true, "offset": OFFSET}, | ||
306 | +{ "start": 4096, "length": 61440, "depth": 0, "zero": true, "data": false, "offset": OFFSET}, | ||
307 | { "start": 65536, "length": 1, "depth": 0, "zero": false, "data": true, "offset": OFFSET}, | ||
308 | { "start": 65537, "length": 511, "depth": 0, "zero": true, "data": false, "offset": OFFSET}] | ||
309 | *** done | ||
310 | diff --git a/tests/qemu-iotests/253.out b/tests/qemu-iotests/253.out | ||
311 | index XXXXXXX..XXXXXXX 100644 | ||
312 | --- a/tests/qemu-iotests/253.out | ||
313 | +++ b/tests/qemu-iotests/253.out | ||
314 | @@ -XXX,XX +XXX,XX @@ QA output created by 253 | ||
315 | === Check mapping of unaligned raw image === | ||
316 | |||
317 | Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048575 | ||
318 | -[{ "start": 0, "length": 1048576, "depth": 0, "zero": true, "data": false, "offset": OFFSET}] | ||
319 | -[{ "start": 0, "length": 1048576, "depth": 0, "zero": true, "data": false, "offset": OFFSET}] | ||
320 | +[{ "start": 0, "length": 4096, "depth": 0, "zero": false, "data": true, "offset": OFFSET}, | ||
321 | +{ "start": 4096, "length": 1044480, "depth": 0, "zero": true, "data": false, "offset": OFFSET}] | ||
322 | +[{ "start": 0, "length": 4096, "depth": 0, "zero": false, "data": true, "offset": OFFSET}, | ||
323 | +{ "start": 4096, "length": 1044480, "depth": 0, "zero": true, "data": false, "offset": OFFSET}] | ||
324 | wrote 65535/65535 bytes at offset 983040 | ||
325 | 63.999 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
326 | -[{ "start": 0, "length": 983040, "depth": 0, "zero": true, "data": false, "offset": OFFSET}, | ||
327 | +[{ "start": 0, "length": 4096, "depth": 0, "zero": false, "data": true, "offset": OFFSET}, | ||
328 | +{ "start": 4096, "length": 978944, "depth": 0, "zero": true, "data": false, "offset": OFFSET}, | ||
329 | { "start": 983040, "length": 65536, "depth": 0, "zero": false, "data": true, "offset": OFFSET}] | ||
330 | -[{ "start": 0, "length": 983040, "depth": 0, "zero": true, "data": false, "offset": OFFSET}, | ||
331 | +[{ "start": 0, "length": 4096, "depth": 0, "zero": false, "data": true, "offset": OFFSET}, | ||
332 | +{ "start": 4096, "length": 978944, "depth": 0, "zero": true, "data": false, "offset": OFFSET}, | ||
333 | { "start": 983040, "length": 65536, "depth": 0, "zero": false, "data": true, "offset": OFFSET}] | ||
334 | *** done | ||
335 | -- | 149 | -- |
336 | 2.21.0 | 150 | 2.24.1 |
337 | 151 | ||
338 | 152 | diff view generated by jsdifflib |
1 | From: Thomas Huth <thuth@redhat.com> | 1 | From: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com> |
---|---|---|---|
2 | 2 | ||
3 | The sanitizers (especially the address sanitizer from Clang) are | 3 | Add the case to the iotest #214 that checks possibility of writing |
4 | sometimes printing out warnings or false positives - this spoils | 4 | compressed data of more than one cluster size. The test case involves |
5 | the output of the iotests, causing some of the tests to fail. | 5 | the compress filter driver showing a sample usage of that. |
6 | Thus let's skip the automatic iotests during "make check" when the | ||
7 | user configured QEMU with --enable-sanitizers. | ||
8 | 6 | ||
9 | Signed-off-by: Thomas Huth <thuth@redhat.com> | 7 | Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com> |
10 | Message-id: 20190823084203.29734-1-thuth@redhat.com | 8 | Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> |
9 | Reviewed-by: Max Reitz <mreitz@redhat.com> | ||
10 | Message-id: 1575288906-551879-4-git-send-email-andrey.shinkevich@virtuozzo.com | ||
11 | Signed-off-by: Max Reitz <mreitz@redhat.com> | 11 | Signed-off-by: Max Reitz <mreitz@redhat.com> |
12 | --- | 12 | --- |
13 | tests/check-block.sh | 5 +++++ | 13 | tests/qemu-iotests/214 | 43 ++++++++++++++++++++++++++++++++++++++ |
14 | 1 file changed, 5 insertions(+) | 14 | tests/qemu-iotests/214.out | 14 +++++++++++++ |
15 | 2 files changed, 57 insertions(+) | ||
15 | 16 | ||
16 | diff --git a/tests/check-block.sh b/tests/check-block.sh | 17 | diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214 |
17 | index XXXXXXX..XXXXXXX 100755 | 18 | index XXXXXXX..XXXXXXX 100755 |
18 | --- a/tests/check-block.sh | 19 | --- a/tests/qemu-iotests/214 |
19 | +++ b/tests/check-block.sh | 20 | +++ b/tests/qemu-iotests/214 |
20 | @@ -XXX,XX +XXX,XX @@ if grep -q "TARGET_GPROF=y" *-softmmu/config-target.mak 2>/dev/null ; then | 21 | @@ -XXX,XX +XXX,XX @@ _check_test_img -r all |
21 | exit 0 | 22 | $QEMU_IO -c "read -P 0x11 0 4M" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_testdir |
22 | fi | 23 | $QEMU_IO -c "read -P 0x22 4M 4M" "$TEST_IMG" 2>&1 | _filter_qemu_io | _filter_testdir |
23 | 24 | ||
24 | +if grep -q "CFLAGS.*-fsanitize" config-host.mak 2>/dev/null ; then | 25 | +echo |
25 | + echo "Sanitizers are enabled ==> Not running the qemu-iotests." | 26 | +echo "=== Write compressed data of multiple clusters ===" |
26 | + exit 0 | 27 | +echo |
28 | +cluster_size=0x10000 | ||
29 | +_make_test_img 2M -o cluster_size=$cluster_size | ||
30 | + | ||
31 | +echo "Write uncompressed data:" | ||
32 | +let data_size="8 * $cluster_size" | ||
33 | +$QEMU_IO -c "write -P 0xaa 0 $data_size" "$TEST_IMG" \ | ||
34 | + 2>&1 | _filter_qemu_io | _filter_testdir | ||
35 | +sizeA=$($QEMU_IMG info --output=json "$TEST_IMG" | | ||
36 | + sed -n '/"actual-size":/ s/[^0-9]//gp') | ||
37 | + | ||
38 | +_make_test_img 2M -o cluster_size=$cluster_size | ||
39 | +echo "Write compressed data:" | ||
40 | +let data_size="3 * $cluster_size + $cluster_size / 2" | ||
41 | +# Set compress on. That will align the written data | ||
42 | +# by the cluster size and will write them compressed. | ||
43 | +QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT \ | ||
44 | +$QEMU_IO -c "write -P 0xbb 0 $data_size" --image-opts \ | ||
45 | + "driver=compress,file.driver=$IMGFMT,file.file.driver=file,file.file.filename=$TEST_IMG" \ | ||
46 | + 2>&1 | _filter_qemu_io | _filter_testdir | ||
47 | + | ||
48 | +let offset="4 * $cluster_size + $cluster_size / 4" | ||
49 | +QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT \ | ||
50 | +$QEMU_IO -c "write -P 0xcc $offset $data_size" "json:{\ | ||
51 | + 'driver': 'compress', | ||
52 | + 'file': {'driver': '$IMGFMT', | ||
53 | + 'file': {'driver': 'file', | ||
54 | + 'filename': '$TEST_IMG'}}}" | \ | ||
55 | + _filter_qemu_io | _filter_testdir | ||
56 | + | ||
57 | +sizeB=$($QEMU_IMG info --output=json "$TEST_IMG" | | ||
58 | + sed -n '/"actual-size":/ s/[^0-9]//gp') | ||
59 | + | ||
60 | +if [ $sizeA -le $sizeB ] | ||
61 | +then | ||
62 | + echo "Compression ERROR" | ||
27 | +fi | 63 | +fi |
28 | + | 64 | + |
29 | if [ -z "$(find . -name 'qemu-system-*' -print)" ]; then | 65 | +$QEMU_IMG check --output=json "$TEST_IMG" | |
30 | echo "No qemu-system binary available ==> Not running the qemu-iotests." | 66 | + sed -n 's/,$//; /"compressed-clusters":/ s/^ *//p' |
31 | exit 0 | 67 | + |
68 | # success, all done | ||
69 | echo '*** done' | ||
70 | rm -f $seq.full | ||
71 | diff --git a/tests/qemu-iotests/214.out b/tests/qemu-iotests/214.out | ||
72 | index XXXXXXX..XXXXXXX 100644 | ||
73 | --- a/tests/qemu-iotests/214.out | ||
74 | +++ b/tests/qemu-iotests/214.out | ||
75 | @@ -XXX,XX +XXX,XX @@ read 4194304/4194304 bytes at offset 0 | ||
76 | 4 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
77 | read 4194304/4194304 bytes at offset 4194304 | ||
78 | 4 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
79 | + | ||
80 | +=== Write compressed data of multiple clusters === | ||
81 | + | ||
82 | +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152 | ||
83 | +Write uncompressed data: | ||
84 | +wrote 524288/524288 bytes at offset 0 | ||
85 | +512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
86 | +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152 | ||
87 | +Write compressed data: | ||
88 | +wrote 229376/229376 bytes at offset 0 | ||
89 | +224 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
90 | +wrote 229376/229376 bytes at offset 278528 | ||
91 | +224 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) | ||
92 | +"compressed-clusters": 8 | ||
93 | *** done | ||
32 | -- | 94 | -- |
33 | 2.21.0 | 95 | 2.24.1 |
34 | 96 | ||
35 | 97 | diff view generated by jsdifflib |
New patch | |||
---|---|---|---|
1 | From: Philippe Mathieu-Daudé <philmd@redhat.com> | ||
1 | 2 | ||
3 | Commit 6f6e1698a6 desugarized "-machine accel=" to a list | ||
4 | of "-accel" options. Since now "-machine accel" and "-accel" | ||
5 | became incompatible, update the iotests to the new format. | ||
6 | |||
7 | Error reported here: | ||
8 | https://gitlab.com/qemu-project/qemu/-/jobs/385801004#L3400 | ||
9 | |||
10 | Reported-by: GitLab CI | ||
11 | Fixes: 6f6e1698a6 (vl: configure accelerators from -accel options) | ||
12 | Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> | ||
13 | Message-id: 20200106130951.29873-1-philmd@redhat.com | ||
14 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
15 | --- | ||
16 | tests/qemu-iotests/235 | 2 +- | ||
17 | tests/qemu-iotests/check | 6 +++--- | ||
18 | 2 files changed, 4 insertions(+), 4 deletions(-) | ||
19 | |||
20 | diff --git a/tests/qemu-iotests/235 b/tests/qemu-iotests/235 | ||
21 | index XXXXXXX..XXXXXXX 100755 | ||
22 | --- a/tests/qemu-iotests/235 | ||
23 | +++ b/tests/qemu-iotests/235 | ||
24 | @@ -XXX,XX +XXX,XX @@ qemu_img_create('-f', iotests.imgfmt, '-o', 'preallocation=metadata', disk, | ||
25 | str(size)) | ||
26 | |||
27 | vm = QEMUMachine(iotests.qemu_prog) | ||
28 | -vm.add_args('-machine', 'accel=kvm:tcg') | ||
29 | +vm.add_args('-accel', 'kvm', '-accel', 'tcg') | ||
30 | if iotests.qemu_default_machine == 's390-ccw-virtio': | ||
31 | vm.add_args('-no-shutdown') | ||
32 | vm.add_args('-drive', 'id=src,file=' + disk) | ||
33 | diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check | ||
34 | index XXXXXXX..XXXXXXX 100755 | ||
35 | --- a/tests/qemu-iotests/check | ||
36 | +++ b/tests/qemu-iotests/check | ||
37 | @@ -XXX,XX +XXX,XX @@ export QEMU_PROG="$(type -p "$QEMU_PROG")" | ||
38 | |||
39 | case "$QEMU_PROG" in | ||
40 | *qemu-system-arm|*qemu-system-aarch64) | ||
41 | - export QEMU_OPTIONS="-nodefaults -display none -machine virt,accel=qtest" | ||
42 | + export QEMU_OPTIONS="-nodefaults -display none -machine virt -accel qtest" | ||
43 | ;; | ||
44 | *qemu-system-tricore) | ||
45 | - export QEMU_OPTIONS="-nodefaults -display none -machine tricore_testboard,accel=qtest" | ||
46 | + export QEMU_OPTIONS="-nodefaults -display none -machine tricore_testboard -accel qtest" | ||
47 | ;; | ||
48 | *) | ||
49 | - export QEMU_OPTIONS="-nodefaults -display none -machine accel=qtest" | ||
50 | + export QEMU_OPTIONS="-nodefaults -display none -accel qtest" | ||
51 | ;; | ||
52 | esac | ||
53 | |||
54 | -- | ||
55 | 2.24.1 | ||
56 | |||
57 | diff view generated by jsdifflib |
New patch | |||
---|---|---|---|
1 | When dropping backup-top, we need to drain the node before freeing the | ||
2 | BlockCopyState. Otherwise, requests may still be in flight and then the | ||
3 | assertion in shres_destroy() will fail. | ||
1 | 4 | ||
5 | (This becomes visible in intermittent failure of 056.) | ||
6 | |||
7 | Cc: qemu-stable@nongnu.org | ||
8 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
9 | Message-id: 20191219182638.104621-1-mreitz@redhat.com | ||
10 | Signed-off-by: Max Reitz <mreitz@redhat.com> | ||
11 | --- | ||
12 | block/backup-top.c | 4 ++-- | ||
13 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/block/backup-top.c b/block/backup-top.c | ||
16 | index XXXXXXX..XXXXXXX 100644 | ||
17 | --- a/block/backup-top.c | ||
18 | +++ b/block/backup-top.c | ||
19 | @@ -XXX,XX +XXX,XX @@ void bdrv_backup_top_drop(BlockDriverState *bs) | ||
20 | BDRVBackupTopState *s = bs->opaque; | ||
21 | AioContext *aio_context = bdrv_get_aio_context(bs); | ||
22 | |||
23 | - block_copy_state_free(s->bcs); | ||
24 | - | ||
25 | aio_context_acquire(aio_context); | ||
26 | |||
27 | bdrv_drained_begin(bs); | ||
28 | |||
29 | + block_copy_state_free(s->bcs); | ||
30 | + | ||
31 | s->active = false; | ||
32 | bdrv_child_refresh_perms(bs, bs->backing, &error_abort); | ||
33 | bdrv_replace_node(bs, backing_bs(bs), &error_abort); | ||
34 | -- | ||
35 | 2.24.1 | ||
36 | |||
37 | diff view generated by jsdifflib |