[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 1/5] iotests: rewrite 192 to use _launch_qemu to fix
From: |
Eric Blake |
Subject: |
[Qemu-block] [PULL 1/5] iotests: rewrite 192 to use _launch_qemu to fix LUKS support |
Date: |
Wed, 6 Sep 2017 10:21:07 -0500 |
From: "Daniel P. Berrange" <address@hidden>
The LUKS driver requires extra args to QEMU to setup passwords.
The _launch_qemu function takes care of this, so convert the
test to use this function and use correct -drive syntax
Signed-off-by: Daniel P. Berrange <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Tested-by: Fam Zheng <address@hidden>
Signed-off-by: Eric Blake <address@hidden>
---
tests/qemu-iotests/192 | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192
index b50a2c0c8e..595f0d786a 100755
--- a/tests/qemu-iotests/192
+++ b/tests/qemu-iotests/192
@@ -37,6 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# get standard environment, filters and checks
. ./common.rc
. ./common.filter
+. ./common.qemu
_supported_fmt generic
_supported_proto file
@@ -49,13 +50,21 @@ fi
size=64M
_make_test_img $size
-{
-echo "nbd_server_start unix:$TEST_DIR/nbd"
-echo "nbd_server_add -w drive0"
-echo "q"
-} | $QEMU -nodefaults -display none -monitor stdio \
- -drive format=$IMGFMT,file=$TEST_IMG,if=ide,id=drive0 \
- -incoming defer 2>&1 | _filter_testdir | _filter_qemu | _filter_hmp
+if test "$IMGOPTSSYNTAX" = "true"
+then
+ DRIVE_ARG=if=ide,id=drive0,$TEST_IMG
+else
+ DRIVE_ARG=if=ide,id=drive0,format=$IMGFMT,file=$TEST_IMG
+fi
+
+qemu_comm_method="monitor"
+_launch_qemu -drive $DRIVE_ARG -incoming defer
+h=$QEMU_HANDLE
+QEMU_COMM_TIMEOUT=1
+
+_send_qemu_cmd $h "nbd_server_start unix:$TEST_DIR/nbd" "(qemu)"
+_send_qemu_cmd $h "nbd_server_add -w drive0" "(qemu)"
+_send_qemu_cmd $h "q" "(qemu)"
# success, all done
echo "*** done"
--
2.13.5
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-block] [PULL 1/5] iotests: rewrite 192 to use _launch_qemu to fix LUKS support,
Eric Blake <=