Commit 9e28bb26 authored by Eric Blake's avatar Eric Blake Committed by Max Reitz
Browse files

qemu-iotests: Simplify 109 with unaligned qemu-img compare 



For some time now, qemu-img compare has been able to compare
unaligned images.  So we no longer need test 109's hack of
resizing to sector boundaries before invoking compare.

Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Message-id: 1463416983-28318-3-git-send-email-eblake@redhat.com
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 4ca1d340

tests/qemu-iotests/109

+0 −2
Original line number Diff line number Diff line
@@ -104,8 +104,6 @@ for sample_img in empty.bochs iotest-dirtylog-10G-4M.vhdx parallels-v1 \ 
    $QEMU_IO -c 'read -P 0 0 64k' "$TEST_IMG" | _filter_qemu_io



    run_qemu "$TEST_IMG" "$TEST_IMG.src" "'format': 'raw'," "BLOCK_JOB_READY"

    # qemu-img compare can't handle unaligned file sizes

    $QEMU_IMG resize -f raw "$TEST_IMG.src" +0

    $QEMU_IMG compare -f raw -F raw "$TEST_IMG" "$TEST_IMG.src"

done

tests/qemu-iotests/109.out

+0 −4
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ read 65536/65536 bytes at offset 0 
{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "src", "len": 2560, "offset": 2560, "speed": 0, "type": "mirror"}}

{"return": [{"io-status": "ok", "device": "src", "busy": false, "len": 2560, "offset": 2560, "paused": false, "speed": 0, "ready": true, "type": "mirror"}]}

Image resized.

Warning: Image size mismatch!

Images are identical.
@@ -164,7 +163,6 @@ read 65536/65536 bytes at offset 0 
{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "src", "len": 31457280, "offset": 31457280, "speed": 0, "type": "mirror"}}

{"return": [{"io-status": "ok", "device": "src", "busy": false, "len": 31457280, "offset": 31457280, "paused": false, "speed": 0, "ready": true, "type": "mirror"}]}

Image resized.

Warning: Image size mismatch!

Images are identical.
@@ -185,7 +183,6 @@ read 65536/65536 bytes at offset 0 
{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "src", "len": 327680, "offset": 327680, "speed": 0, "type": "mirror"}}

{"return": [{"io-status": "ok", "device": "src", "busy": false, "len": 327680, "offset": 327680, "paused": false, "speed": 0, "ready": true, "type": "mirror"}]}

Image resized.

Warning: Image size mismatch!

Images are identical.
@@ -206,7 +203,6 @@ read 65536/65536 bytes at offset 0 
{"return": {}}

{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "src", "len": 2048, "offset": 2048, "speed": 0, "type": "mirror"}}

{"return": [{"io-status": "ok", "device": "src", "busy": false, "len": 2048, "offset": 2048, "paused": false, "speed": 0, "ready": true, "type": "mirror"}]}

Image resized.

Warning: Image size mismatch!

Images are identical.