From 1fd06db03da73db868e54b838bb5ea02c10eea6c Mon Sep 17 00:00:00 2001 From: Max Reitz Date: Tue, 29 Mar 2016 18:24:17 +0200 Subject: iotests: Make 150 use qemu-img map instead of du The actual on-disk size of a file does not only depend on factors qemu can control. Thus, we should not depend on this to determine whether a file has indeed been fully allocated. Instead, use qemu-img map and hope that if an area is referenced, it is indeed allocated, too. Also, limit the supported image formats to raw and qcow2 because the actual qemu-img map output may depend on the image format. Signed-off-by: Max Reitz Tested-by: Paolo Bonzini Signed-off-by: Kevin Wolf --- tests/qemu-iotests/150.out | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'tests/qemu-iotests/150.out') diff --git a/tests/qemu-iotests/150.out b/tests/qemu-iotests/150.out index 2d29da13e7..2a54e8dcfa 100644 --- a/tests/qemu-iotests/150.out +++ b/tests/qemu-iotests/150.out @@ -1,14 +1,11 @@ QA output created by 150 -=== Comparing empty image against sparse conversion === +=== Mapping sparse conversion === -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 -Equal image size +Offset Length File -=== Comparing full image against non-sparse conversion === +=== Mapping non-sparse conversion === -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 -wrote 1048576/1048576 bytes at offset 0 -1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -Equal image size +Offset Length File +0 0x100000 TEST_DIR/t.IMGFMT *** done -- cgit v1.2.3