Re: [Qemu-devel] [PATCH v3 5/5] iotests: Add test for relative backing file names

[Fam Zheng]

On Mon, 11/24 10:43, Max Reitz wrote:
> Sometimes, qemu does not have a filename to work with, so it does not
> know which directory to use for a backing file specified by a relative
> filename. Add a test which tests that qemu exits with an appropriate
> error message.
> 
> Additionally, add a test for qemu-img create with a backing filename
> relative to the backed image's base directory while omitting the image
> size.
> 
> Signed-off-by: Max Reitz <address@hidden>
> ---
>  tests/qemu-iotests/110     | 94 
> ++++++++++++++++++++++++++++++++++++++++++++++
>  tests/qemu-iotests/110.out | 19 ++++++++++
>  tests/qemu-iotests/group   |  1 +
>  3 files changed, 114 insertions(+)
>  create mode 100755 tests/qemu-iotests/110
>  create mode 100644 tests/qemu-iotests/110.out
> 
> diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110
> new file mode 100755
> index 0000000..63664f5
> --- /dev/null
> +++ b/tests/qemu-iotests/110
> @@ -0,0 +1,94 @@
> +#!/bin/bash
> +#
> +# Test case for relative backing file names in complex BDS trees
> +#
> +# Copyright (C) 2014 Red Hat, Inc.
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; either version 2 of the License, or
> +# (at your option) any later version.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
> +#
> +
> +# creator
> address@hidden
> +
> +seq="$(basename $0)"
> +echo "QA output created by $seq"
> +
> +here="$PWD"
> +tmp=/tmp/$$
> +status=1     # failure is the default!
> +
> +_cleanup()
> +{
> +     _cleanup_test_img
> +}
> +trap "_cleanup; exit \$status" 0 1 2 3 15
> +
> +# get standard environment, filters and checks
> +. ./common.rc
> +. ./common.filter
> +
> +# Any format supporting backing files
> +_supported_fmt qed qcow qcow2 vmdk
> +_supported_proto file
> +_supported_os Linux
> +_unsupported_imgopts "subformat=monolithicFlat" 
> "subformat=twoGbMaxExtentFlat"
> +
> +TEST_IMG_REL=$(basename "$TEST_IMG")
> +
> +echo
> +echo '=== Reconstructable filename ==='
> +echo
> +
> +TEST_IMG="$TEST_IMG.base" _make_test_img 64M
> +_make_test_img -b "$TEST_IMG_REL.base" 64M
> +# qemu should be able to reconstruct the filename, so relative backing names
> +# should work
> +TEST_IMG="json:{'driver':'$IMGFMT','file':{'driver':'file','filename':'$TEST_IMG'}}"
>  \
> +    _img_info | _filter_img_info
> +
> +echo
> +echo '=== Non-reconstructable filename ==='
> +echo
> +
> +# Across blkdebug without a config file, you cannot reconstruct filenames, so
> +# qemu is incapable of knowing the directory of the top image
> +TEST_IMG="json:{
> +    'driver': '$IMGFMT',
> +    'file': {
> +        'driver': 'blkdebug',
> +        'image': {
> +            'driver': 'file',
> +            'filename': '$TEST_IMG'
> +        },
> +        'set-state': [
> +            {
> +                'event': 'read_aio',
> +                'new_state': 42
> +            }
> +        ]
> +    }
> +}" _img_info | _filter_img_info
> +
> +echo
> +echo '=== Backing name is always relative to the backed image ==='
> +echo
> +
> +# omit the image size; it shoud work anyway
> +_make_test_img -b "$TEST_IMG_REL.base"
> +
> +
> +# success, all done
> +echo '*** done'
> +rm -f $seq.full
> +status=0
> diff --git a/tests/qemu-iotests/110.out b/tests/qemu-iotests/110.out
> new file mode 100644
> index 0000000..056ffec
> --- /dev/null
> +++ b/tests/qemu-iotests/110.out
> @@ -0,0 +1,19 @@
> +QA output created by 110
> +
> +=== Reconstructable filename ===
> +
> +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864
> +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 
> backing_file='t.IMGFMT.base'
> +image: TEST_DIR/t.IMGFMT
> +file format: IMGFMT
> +virtual size: 64M (67108864 bytes)
> +backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base)
> +
> +=== Non-reconstructable filename ===
> +
> +qemu-img: Cannot use relative backing file names for 'json:{"driver": 
> "IMGFMT", "file": {"set-state": [{"new_state": 42, "state": 0, "event": 
> "read_aio"}], "image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, 
> "driver": "blkdebug"}}'
> +
> +=== Backing name is always relative to the backed image ===
> +
> +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 
> backing_file='t.IMGFMT.base'
> +*** done
> diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
> index 7dfe469..de3c643 100644
> --- a/tests/qemu-iotests/group
> +++ b/tests/qemu-iotests/group
> @@ -111,4 +111,5 @@
>  105 rw auto quick
>  107 rw auto quick
>  108 rw auto quick
> +110 rw auto backing quick
>  111 rw auto quick
> -- 
> 1.9.3
> 
> 

Reviewed-by: Fam Zheng <address@hidden>