@@ -21,14 +21,14 @@
import iotests
import json
import struct
-from iotests import qemu_img_create, qemu_io, qemu_img_pipe, \
- file_path, img_info_log, log, filter_qemu_io
+from iotests import create_test_image, remove_test_image, qemu_io, \
+ qemu_img_pipe, image_path, img_info_log, log, filter_qemu_io
iotests.script_initialize(supported_fmts=['qcow2'],
# compat=1.1 is needed for dirty bitmaps
unsupported_imgopts=['compat=0.10'])
-disk = file_path('disk')
+disk = image_path('disk')
chunk = 256 * 1024
bitmap_flag_unknown = 1 << 2
# flag_offset = 5*cluster_size + flag_offset_in_bitmap_directory_entry
@@ -74,7 +74,7 @@ def toggle_flag(offset):
f.write(struct.pack("B", toggled))
-qemu_img_create('-f', iotests.imgfmt, disk, '1M')
+create_test_image(disk, '1M')
for num in range(1, 4):
disabled = False
@@ -95,7 +95,8 @@ vm.shutdown()
num += 1
log('\nTest {}'.format(num))
-qemu_img_create('-f', iotests.imgfmt, disk, '1M')
+remove_test_image(disk)
+create_test_image(disk, '1M')
add_bitmap(1, True, False)
log('Write an unknown bitmap flag \'{}\' into a new QCOW2 image at offset {}'
.format(hex(bitmap_flag_unknown), flag_offset))
Signed-off-by: Max Reitz <mreitz@redhat.com> --- tests/qemu-iotests/242 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)