From: "Daniel P. Berrange" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, Kevin Wolf <kwolf@redhat.com>,
Max Reitz <mreitz@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Fam Zheng <famz@redhat.com>,
"Daniel P. Berrange" <berrange@redhat.com>
Subject: [Qemu-devel] [PATCH 1/2] iotests: rewrite 192 to use _launch_qemu to fix LUKS support
Date: Fri, 1 Sep 2017 11:54:33 +0100 [thread overview]
Message-ID: <20170901105434.3288-2-berrange@redhat.com> (raw)
In-Reply-To: <20170901105434.3288-1-berrange@redhat.com>
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 <berrange@redhat.com>
---
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
next prev parent reply other threads:[~2017-09-01 10:55 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-01 10:54 [Qemu-devel] [PATCH 0/2] Fix / skip recent iotests with LUKS driver Daniel P. Berrange
2017-09-01 10:54 ` Daniel P. Berrange [this message]
2017-09-01 14:22 ` [Qemu-devel] [PATCH 1/2] iotests: rewrite 192 to use _launch_qemu to fix LUKS support Eric Blake
2017-09-05 9:29 ` Kevin Wolf
2017-09-01 10:54 ` [Qemu-devel] [PATCH 2/2] iotests: blacklist 194 with the luks driver Daniel P. Berrange
2017-09-01 14:25 ` Eric Blake
2017-09-04 9:14 ` [Qemu-devel] [Qemu-block] " Kashyap Chamarthy
2017-09-05 10:04 ` Stefan Hajnoczi
2017-09-01 14:26 ` [Qemu-devel] [PATCH 0/2] Fix / skip recent iotests with LUKS driver Eric Blake
2017-09-01 14:33 ` Daniel P. Berrange
2017-09-01 20:10 ` Eric Blake
2017-09-01 14:55 ` Fam Zheng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170901105434.3288-2-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=famz@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.