On Mon, Jun 04, 2018 at 04:14:37PM +0200, Max Reitz wrote:
> Signed-off-by: Max Reitz <mre...@redhat.com>
Aborts without patch 1, passes with it, so a twofer:
Tested-by: Jeff Cody <jc...@redhat.com>
Reviewed-by: Jeff Cody <jc...@redhat.com>
> ---
> tests/qemu-iotests/060 | 30 ++++++++++++++++++++++++++++++
> tests/qemu-iotests/060.out | 14 ++++++++++++++
> 2 files changed, 44 insertions(+)
>
> diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
> index 6c7407f499..7bdf609f3f 100755
> --- a/tests/qemu-iotests/060
> +++ b/tests/qemu-iotests/060
> @@ -440,6 +440,36 @@ echo "{'execute': 'qmp_capabilities'}
> -drive if=none,node-name=drive,file="$TEST_IMG",driver=qcow2 \
> | _filter_qmp | _filter_qemu_io
>
> +echo
> +echo "=== Testing incoming inactive corrupted image ==="
> +echo
> +
> +_make_test_img 64M
> +# Create an unaligned L1 entry, so qemu will signal a corruption when
> +# reading from the covered area
> +poke_file "$TEST_IMG" "$l1_offset" "\x00\x00\x00\x00\x2a\x2a\x2a\x2a"
> +
> +# Inactive images are effectively read-only images, so this should be a
> +# non-fatal corruption (which does not modify the image)
> +echo "{'execute': 'qmp_capabilities'}
> + {'execute': 'human-monitor-command',
> + 'arguments': {'command-line': 'qemu-io drive \"read 0 512\"'}}
> + {'execute': 'quit'}" \
> + | $QEMU -qmp stdio -nographic -nodefaults \
> + -blockdev "{'node-name': 'drive',
> + 'driver': 'qcow2',
> + 'file': {
> + 'driver': 'file',
> + 'filename': '$TEST_IMG'
> + }}" \
> + -incoming exec:'cat /dev/null' \
> + 2>&1 \
> + | _filter_qmp | _filter_qemu_io
> +
> +echo
> +# Image should not have been marked corrupt
> +_img_info --format-specific | grep 'corrupt:'
> +
> # success, all done
> echo "*** done"
> rm -f $seq.full
> diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out
> index 5f4264cff6..bff023d889 100644
> --- a/tests/qemu-iotests/060.out
> +++ b/tests/qemu-iotests/060.out
> @@ -420,4 +420,18 @@ write failed: Input/output error
> {"return": ""}
> {"return": {}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "SHUTDOWN", "data": {"guest": false}}
> +
> +=== Testing incoming inactive corrupted image ===
> +
> +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> +QMP_VERSION
> +{"return": {}}
> +qcow2: Image is corrupt: L2 table offset 0x2a2a2a00 unaligned (L1 index: 0);
> further non-fatal corruption events will be suppressed
> +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "BLOCK_IMAGE_CORRUPTED", "data": {"device": "", "msg": "L2 table offset
> 0x2a2a2a00 unaligned (L1 index: 0)", "node-name": "drive", "fatal": false}}
> +read failed: Input/output error
> +{"return": ""}
> +{"return": {}}
> +{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
> "SHUTDOWN", "data": {"guest": false}}
> +
> + corrupt: false
> *** done
> --
> 2.17.0
>
>
