haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

tests/qemu-iotests: use AIOMODE with various tests

Browse source 
Signed-off-by: Aarushi Mehta <mehta.aaru20@gmail.com>
Acked-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20200120141858.587874-16-stefanha@redhat.com
Message-Id: <20200120141858.587874-16-stefanha@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Aarushi Mehta 2020-01-20 14:18:58 +00:00 committed by Stefan Hajnoczi
parent 7156ca4888
commit 8dff69b941
11 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/qemu-iotests/028
View file

@ -108,7 +108,7 @@ echo block-backup
echo echo
qemu_comm_method="monitor" qemu_comm_method="monitor"
_launch_qemu -drive file="${TEST_IMG}",cache=${CACHEMODE},id=disk _launch_qemu -drive file="${TEST_IMG}",cache=${CACHEMODE},aio=${AIOMODE},id=disk
h=$QEMU_HANDLE h=$QEMU_HANDLE
if [ "${VALGRIND_QEMU}" == "y" ]; then if [ "${VALGRIND_QEMU}" == "y" ]; then
QEMU_COMM_TIMEOUT=7 QEMU_COMM_TIMEOUT=7

2
tests/qemu-iotests/058
View file

@ -65,7 +65,7 @@ nbd_snapshot_img="nbd:unix:$nbd_unix_socket"
converted_image=$TEST_IMG.converted converted_image=$TEST_IMG.converted
# Use -f raw instead of -f $IMGFMT for the NBD connection # Use -f raw instead of -f $IMGFMT for the NBD connection
QEMU_IO_NBD="$QEMU_IO -f raw --cache=$CACHEMODE" QEMU_IO_NBD="$QEMU_IO -f raw --cache=$CACHEMODE --aio=$AIOMODE"
echo echo
echo "== preparing image ==" echo "== preparing image =="

4
tests/qemu-iotests/089
View file

@ -64,7 +64,7 @@ $QEMU_IO -c 'write -P 42 0 512' -c 'write -P 23 512 512' \
$QEMU_IMG convert -f raw -O $IMGFMT "$TEST_IMG.base" "$TEST_IMG" $QEMU_IMG convert -f raw -O $IMGFMT "$TEST_IMG.base" "$TEST_IMG"
$QEMU_IO_PROG --cache $CACHEMODE \ $QEMU_IO_PROG --cache $CACHEMODE --aio $AIOMODE \
-c 'read -P 42 0 512' -c 'read -P 23 512 512' \ -c 'read -P 42 0 512' -c 'read -P 23 512 512' \
-c 'read -P 66 1024 512' "json:{ -c 'read -P 66 1024 512' "json:{
\"driver\": \"$IMGFMT\", \"driver\": \"$IMGFMT\",
@ -111,7 +111,7 @@ $QEMU_IO -c 'write -P 42 0x38000 512' "$TEST_IMG" | _filter_qemu_io
# The "image.filename" part tests whether "a": { "b": "c" } and "a.b": "c" do # The "image.filename" part tests whether "a": { "b": "c" } and "a.b": "c" do
# the same (which they should). # the same (which they should).
$QEMU_IO_PROG --cache $CACHEMODE \ $QEMU_IO_PROG --cache $CACHEMODE --aio $AIOMODE \
-c 'read -P 42 0x38000 512' "json:{ -c 'read -P 42 0x38000 512' "json:{
\"driver\": \"$IMGFMT\", \"driver\": \"$IMGFMT\",
\"file\": { \"file\": {

4
tests/qemu-iotests/091
View file

@ -60,13 +60,13 @@ echo === Starting QEMU VM1 ===
echo echo
qemu_comm_method="monitor" qemu_comm_method="monitor"
_launch_qemu -drive file="${TEST_IMG}",cache=${CACHEMODE},id=disk _launch_qemu -drive file="${TEST_IMG}",cache=${CACHEMODE},aio=${AIOMODE},id=disk
h1=$QEMU_HANDLE h1=$QEMU_HANDLE
echo echo
echo === Starting QEMU VM2 === echo === Starting QEMU VM2 ===
echo echo
_launch_qemu -drive file="${TEST_IMG}",cache=${CACHEMODE},id=disk \ _launch_qemu -drive file="${TEST_IMG}",cache=${CACHEMODE},aio=${AIOMODE},id=disk \
-incoming "exec: cat '${MIG_FIFO}'" -incoming "exec: cat '${MIG_FIFO}'"
h2=$QEMU_HANDLE h2=$QEMU_HANDLE

2
tests/qemu-iotests/109
View file

@ -52,7 +52,7 @@ run_qemu()
local qmp_format="$3" local qmp_format="$3"
local qmp_event="$4" local qmp_event="$4"
_launch_qemu -drive file="${source_img}",format=raw,cache=${CACHEMODE},id=src _launch_qemu -drive file="${source_img}",format=raw,cache=${CACHEMODE},aio=${AIOMODE},id=src
_send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'qmp_capabilities' }" "return" _send_qemu_cmd $QEMU_HANDLE "{ 'execute': 'qmp_capabilities' }" "return"
_send_qemu_cmd $QEMU_HANDLE \ _send_qemu_cmd $QEMU_HANDLE \

5
tests/qemu-iotests/147
View file

@ -24,7 +24,7 @@ import socket
import stat import stat
import time import time
import iotests import iotests
from iotests import cachemode, imgfmt, qemu_img, qemu_nbd, qemu_nbd_early_pipe from iotests import cachemode, aiomode, imgfmt, qemu_img, qemu_nbd, qemu_nbd_early_pipe
NBD_PORT_START = 32768 NBD_PORT_START = 32768
NBD_PORT_END = NBD_PORT_START + 1024 NBD_PORT_END = NBD_PORT_START + 1024
@ -134,7 +134,8 @@ class BuiltinNBD(NBDBlockdevAddBase):
self.server.add_drive_raw('if=none,id=nbd-export,' + self.server.add_drive_raw('if=none,id=nbd-export,' +
'file=%s,' % test_img + 'file=%s,' % test_img +
'format=%s,' % imgfmt + 'format=%s,' % imgfmt +
'cache=%s' % cachemode) 'cache=%s' % cachemode +
'aio=%s' % aiomode)
self.server.launch() self.server.launch()
def tearDown(self): def tearDown(self):

8
tests/qemu-iotests/181
View file

@ -58,20 +58,20 @@ qemu_comm_method="monitor"
if [ "$IMGOPTSSYNTAX" = "true" ]; then if [ "$IMGOPTSSYNTAX" = "true" ]; then
_launch_qemu \ _launch_qemu \
-drive "${TEST_IMG}",cache=${CACHEMODE},id=disk -drive "${TEST_IMG}",cache=${CACHEMODE},aio=$AIOMODE,id=disk
else else
_launch_qemu \ _launch_qemu \
-drive file="${TEST_IMG}",cache=${CACHEMODE},driver=$IMGFMT,id=disk -drive file="${TEST_IMG}",cache=${CACHEMODE},aio=$AIOMODE,driver=$IMGFMT,id=disk
fi fi
src=$QEMU_HANDLE src=$QEMU_HANDLE
if [ "$IMGOPTSSYNTAX" = "true" ]; then if [ "$IMGOPTSSYNTAX" = "true" ]; then
_launch_qemu \ _launch_qemu \
-drive "${TEST_IMG}",cache=${CACHEMODE},id=disk \ -drive "${TEST_IMG}",cache=${CACHEMODE},aio=$AIOMODE,id=disk \
-incoming "unix:${MIG_SOCKET}" -incoming "unix:${MIG_SOCKET}"
else else
_launch_qemu \ _launch_qemu \
-drive file="${TEST_IMG}",cache=${CACHEMODE},driver=$IMGFMT,id=disk \ -drive file="${TEST_IMG}",cache=${CACHEMODE},aio=$AIOMODE,driver=$IMGFMT,id=disk \
-incoming "unix:${MIG_SOCKET}" -incoming "unix:${MIG_SOCKET}"
fi fi
dest=$QEMU_HANDLE dest=$QEMU_HANDLE

4
tests/qemu-iotests/183
View file

@ -56,12 +56,12 @@ echo
qemu_comm_method="qmp" qemu_comm_method="qmp"
_launch_qemu \ _launch_qemu \
-drive file="${TEST_IMG}",cache=$CACHEMODE,driver=$IMGFMT,id=disk -drive file="${TEST_IMG}",cache=$CACHEMODE,aio=$AIOMODE,driver=$IMGFMT,id=disk
src=$QEMU_HANDLE src=$QEMU_HANDLE
_send_qemu_cmd $src "{ 'execute': 'qmp_capabilities' }" 'return' _send_qemu_cmd $src "{ 'execute': 'qmp_capabilities' }" 'return'
_launch_qemu \ _launch_qemu \
-drive file="${TEST_IMG}.dest",cache=$CACHEMODE,driver=$IMGFMT,id=disk \ -drive file="${TEST_IMG}.dest",cache=$CACHEMODE,aio=$AIOMODE,driver=$IMGFMT,id=disk \
-incoming "unix:${MIG_SOCKET}" -incoming "unix:${MIG_SOCKET}"
dest=$QEMU_HANDLE dest=$QEMU_HANDLE
_send_qemu_cmd $dest "{ 'execute': 'qmp_capabilities' }" 'return' _send_qemu_cmd $dest "{ 'execute': 'qmp_capabilities' }" 'return'

10
tests/qemu-iotests/185
View file

@ -54,7 +54,7 @@ echo
qemu_comm_method="qmp" qemu_comm_method="qmp"
_launch_qemu \ _launch_qemu \
-drive file="${TEST_IMG}.base",cache=$CACHEMODE,driver=$IMGFMT,id=disk -drive file="${TEST_IMG}.base",cache=$CACHEMODE,aio=$AIOMODE,driver=$IMGFMT,id=disk
h=$QEMU_HANDLE h=$QEMU_HANDLE
_send_qemu_cmd $h "{ 'execute': 'qmp_capabilities' }" 'return' _send_qemu_cmd $h "{ 'execute': 'qmp_capabilities' }" 'return'
@ -125,7 +125,7 @@ echo === Start active commit job and exit qemu ===
echo echo
_launch_qemu \ _launch_qemu \
-drive file="${TEST_IMG}",cache=$CACHEMODE,driver=$IMGFMT,id=disk -drive file="${TEST_IMG}",cache=$CACHEMODE,aio=$AIOMODE,driver=$IMGFMT,id=disk
h=$QEMU_HANDLE h=$QEMU_HANDLE
_send_qemu_cmd $h "{ 'execute': 'qmp_capabilities' }" 'return' _send_qemu_cmd $h "{ 'execute': 'qmp_capabilities' }" 'return'
@ -147,7 +147,7 @@ echo === Start mirror job and exit qemu ===
echo echo
_launch_qemu \ _launch_qemu \
-drive file="${TEST_IMG}",cache=$CACHEMODE,driver=$IMGFMT,id=disk -drive file="${TEST_IMG}",cache=$CACHEMODE,aio=$AIOMODE,driver=$IMGFMT,id=disk
h=$QEMU_HANDLE h=$QEMU_HANDLE
_send_qemu_cmd $h "{ 'execute': 'qmp_capabilities' }" 'return' _send_qemu_cmd $h "{ 'execute': 'qmp_capabilities' }" 'return'
@ -172,7 +172,7 @@ echo === Start backup job and exit qemu ===
echo echo
_launch_qemu \ _launch_qemu \
-drive file="${TEST_IMG}",cache=$CACHEMODE,driver=$IMGFMT,id=disk -drive file="${TEST_IMG}",cache=$CACHEMODE,aio=$AIOMODE,driver=$IMGFMT,id=disk
h=$QEMU_HANDLE h=$QEMU_HANDLE
_send_qemu_cmd $h "{ 'execute': 'qmp_capabilities' }" 'return' _send_qemu_cmd $h "{ 'execute': 'qmp_capabilities' }" 'return'
@ -196,7 +196,7 @@ echo === Start streaming job and exit qemu ===
echo echo
_launch_qemu \ _launch_qemu \
-drive file="${TEST_IMG}",cache=$CACHEMODE,driver=$IMGFMT,id=disk -drive file="${TEST_IMG}",cache=$CACHEMODE,aio=$AIOMODE,driver=$IMGFMT,id=disk
h=$QEMU_HANDLE h=$QEMU_HANDLE
_send_qemu_cmd $h "{ 'execute': 'qmp_capabilities' }" 'return' _send_qemu_cmd $h "{ 'execute': 'qmp_capabilities' }" 'return'

2
tests/qemu-iotests/200
View file

@ -67,7 +67,7 @@ echo === Starting QEMU VM ===
echo echo
qemu_comm_method="qmp" qemu_comm_method="qmp"
_launch_qemu -object iothread,id=iothread0 $virtio_scsi \ _launch_qemu -object iothread,id=iothread0 $virtio_scsi \
-drive file="${TEST_IMG}",media=disk,if=none,cache=$CACHEMODE,id=drive_sysdisk,format=$IMGFMT \ -drive file="${TEST_IMG}",media=disk,if=none,cache=$CACHEMODE,aio=$AIOMODE,id=drive_sysdisk,format=$IMGFMT \
-device scsi-hd,drive=drive_sysdisk,bus=scsi0.0,id=sysdisk,bootindex=0 -device scsi-hd,drive=drive_sysdisk,bus=scsi0.0,id=sysdisk,bootindex=0
h1=$QEMU_HANDLE h1=$QEMU_HANDLE

8
tests/qemu-iotests/201
View file

@ -58,20 +58,20 @@ qemu_comm_method="monitor"
if [ "$IMGOPTSSYNTAX" = "true" ]; then if [ "$IMGOPTSSYNTAX" = "true" ]; then
_launch_qemu \ _launch_qemu \
-drive "${TEST_IMG}",cache=${CACHEMODE},id=disk -drive "${TEST_IMG}",cache=${CACHEMODE},aio=$AIOMODE,id=disk
else else
_launch_qemu \ _launch_qemu \
-drive file="${TEST_IMG}",cache=${CACHEMODE},driver=$IMGFMT,id=disk -drive file="${TEST_IMG}",cache=${CACHEMODE},aio=$AIOMODE,driver=$IMGFMT,id=disk
fi fi
src=$QEMU_HANDLE src=$QEMU_HANDLE
if [ "$IMGOPTSSYNTAX" = "true" ]; then if [ "$IMGOPTSSYNTAX" = "true" ]; then
_launch_qemu \ _launch_qemu \
-drive "${TEST_IMG}",cache=${CACHEMODE},id=disk \ -drive "${TEST_IMG}",cache=${CACHEMODE},aio=$AIOMODE,id=disk \
-incoming "unix:${MIG_SOCKET}" -incoming "unix:${MIG_SOCKET}"
else else
_launch_qemu \ _launch_qemu \
-drive file="${TEST_IMG}",cache=${CACHEMODE},driver=$IMGFMT,id=disk \ -drive file="${TEST_IMG}",cache=${CACHEMODE},aio=$AIOMODE,driver=$IMGFMT,id=disk \
-incoming "unix:${MIG_SOCKET}" -incoming "unix:${MIG_SOCKET}"
fi fi
dest=$QEMU_HANDLE dest=$QEMU_HANDLE