Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Adding breaktrace & disabling timer migration"
[kvmfornfv.git]
/
qemu
/
tests
/
qemu-iotests
/
common
diff --git
a/qemu/tests/qemu-iotests/common
b/qemu/tests/qemu-iotests/common
index
1030aaf
..
49e1931
100644
(file)
--- a/
qemu/tests/qemu-iotests/common
+++ b/
qemu/tests/qemu-iotests/common
@@
-41,7
+41,6
@@
sortme=false
expunge=true
have_test_arg=false
randomize=false
expunge=true
have_test_arg=false
randomize=false
-valgrind=false
cachemode=false
rm -f $tmp.list $tmp.tmp $tmp.sed
cachemode=false
rm -f $tmp.list $tmp.tmp $tmp.sed
@@
-52,6
+51,8
@@
export IMGOPTS=""
export CACHEMODE="writeback"
export QEMU_IO_OPTIONS=""
export CACHEMODE_IS_DEFAULT=true
export CACHEMODE="writeback"
export QEMU_IO_OPTIONS=""
export CACHEMODE_IS_DEFAULT=true
+export QEMU_OPTIONS="-nodefaults"
+export VALGRIND_QEMU=
for r
do
for r
do
@@
-154,6
+155,7
@@
check options
-ssh test ssh
-nfs test nfs
-archipelago test archipelago
-ssh test ssh
-nfs test nfs
-archipelago test archipelago
+ -luks test luks
-xdiff graphical mode diff
-nocache use O_DIRECT on backing file
-misalign misalign memory allocations
-xdiff graphical mode diff
-nocache use O_DIRECT on backing file
-misalign misalign memory allocations
@@
-277,7
+279,7
@@
testlist options
;;
-valgrind)
;;
-valgrind)
- valgrind=true
+ VALGRIND_QEMU='y'
xpand=false
;;
xpand=false
;;
@@
-435,8
+437,3
@@
fi
if [ "$IMGPROTO" = "nbd" ] ; then
[ "$QEMU_NBD" = "" ] && _fatal "qemu-nbd not found"
fi
if [ "$IMGPROTO" = "nbd" ] ; then
[ "$QEMU_NBD" = "" ] && _fatal "qemu-nbd not found"
fi
-
-if $valgrind; then
- export REAL_QEMU_IO="$QEMU_IO_PROG"
- export QEMU_IO_PROG=valgrind_qemu_io
-fi