Commit f210a83c authored by Fam Zheng's avatar Fam Zheng Committed by Stefan Hajnoczi
Browse files

qemu-iotests: Add _default_cache_mode and _supported_cache_modes 



This replaces _unsupported_qemu_io_options and check for support of
current cache mode, and allow to provide a default if user didn't
specify.

Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Reviewed-by: default avatarWenchao Xia <xiawenc@linux.vnet.ibm.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 58cc2ae1

tests/qemu-iotests/026

+2 −1
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 
_supported_fmt qcow2

_supported_proto generic

_supported_os Linux



_default_cache_mode "writethrough"

_supported_cache_modes "writethrough" "none"



echo "Errors while writing 128 kB"

echo

tests/qemu-iotests/039

+2 −1
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 
_supported_fmt qcow2

_supported_proto generic

_supported_os Linux

_unsupported_qemu_io_options --nocache

_default_cache_mode "writethrough"

_supported_cache_modes "writethrough"



size=128M

tests/qemu-iotests/052

+2 −2
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 
_supported_fmt generic

_supported_proto generic

_supported_os Linux

_unsupported_qemu_io_options --nocache



_default_cache_mode "writethrough"

_supported_cache_modes "writethrough"



size=128M

_make_test_img $size

tests/qemu-iotests/common.rc

+15 −10
Original line number Diff line number Diff line
@@ -387,18 +387,23 @@ _supported_os() 
    _notrun "not suitable for this OS: $HOSTOS"

}



_unsupported_qemu_io_options()

_supported_cache_modes()

{

    for bad_opt

    do

        for opt in $QEMU_IO_OPTIONS

        do

            if [ "$bad_opt" = "$opt" ]

            then

                _notrun "not suitable for qemu-io option: $bad_opt"

    for mode; do

        if [ "$mode" = "$CACHEMODE" ]; then

            return

        fi

    done

    done

    _notrun "not suitable for cache mode: $CACHEMODE"

}



_default_cache_mode()

{

    if $CACHEMODE_IS_DEFAULT; then

        CACHEMODE="$1"

        QEMU_IO="$QEMU_IO --cache $1"

        return

    fi

}



# this test requires that a specified command (executable) exists