openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Fam Zheng <famz@redhat.com>
Reviewed-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Fam Zheng 2013-12-04 09:07:00 +08:00 committed by Stefan Hajnoczi
parent 58cc2ae1e3
commit f210a83c1f
4 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/qemu-iotests/026
View File

@ -44,7 +44,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2 _supported_fmt qcow2
_supported_proto generic _supported_proto generic
_supported_os Linux _supported_os Linux
_default_cache_mode "writethrough"
_supported_cache_modes "writethrough" "none"
echo "Errors while writing 128 kB" echo "Errors while writing 128 kB"
echo echo

3
tests/qemu-iotests/039
View File

@ -44,7 +44,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2 _supported_fmt qcow2
_supported_proto generic _supported_proto generic
_supported_os Linux _supported_os Linux
_unsupported_qemu_io_options --nocache _default_cache_mode "writethrough"
_supported_cache_modes "writethrough"
size=128M size=128M

4
tests/qemu-iotests/052
View File

@ -41,8 +41,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic _supported_fmt generic
_supported_proto generic _supported_proto generic
_supported_os Linux _supported_os Linux
_unsupported_qemu_io_options --nocache _default_cache_mode "writethrough"
_supported_cache_modes "writethrough"
size=128M size=128M
_make_test_img $size _make_test_img $size

23
tests/qemu-iotests/common.rc
View File

@ -387,18 +387,23 @@ _supported_os()
_notrun "not suitable for this OS: $HOSTOS" _notrun "not suitable for this OS: $HOSTOS"
} }
_unsupported_qemu_io_options() _supported_cache_modes()
{ {
for bad_opt for mode; do
do if [ "$mode" = "$CACHEMODE" ]; then
for opt in $QEMU_IO_OPTIONS return
do
if [ "$bad_opt" = "$opt" ]
then
_notrun "not suitable for qemu-io option: $bad_opt"
fi fi
done 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 # this test requires that a specified command (executable) exists