falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iotests: Only kill NBD server if it runs 

There may be NBD tests which do not create a sample image and simply
test whether wrong usage of the protocol is rejected as expected. In
this case, there will be no NBD server and trying to kill it during
clean-up will fail.

Cc: qemu-stable@nongnu.org
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
(cherry picked from commit f798068c56)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Max Reitz 2014-12-02 18:32:48 +01:00 committed by Michael Roth
parent b15bfd0558
commit 0a0a984352
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,7 +175,9 @@ _cleanup_test_img()
case "$IMGPROTO" in
nbd)
kill $QEMU_NBD_PID
if [ -n "$QEMU_NBD_PID" ]; then
kill $QEMU_NBD_PID
fi
rm -f "$TEST_IMG_FILE"
;;
file)