[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 08/13] iotests: fix nbd test 233 to work correctly wi
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 08/13] iotests: fix nbd test 233 to work correctly with raw images |
Date: |
Thu, 22 Nov 2018 17:54:12 +0100 |
From: Daniel P. Berrangé <address@hidden>
The first qemu-io command must honour the $IMGFMT that is set rather
than hardcoding qcow2. The qemu-nbd commands should also set $IMGFMT
to avoid the insecure format probe warning.
Signed-off-by: Daniel P. Berrangé <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
tests/qemu-iotests/233 | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/233 b/tests/qemu-iotests/233
index a4da60d0ad..1814efe333 100755
--- a/tests/qemu-iotests/233
+++ b/tests/qemu-iotests/233
@@ -66,7 +66,7 @@ $QEMU_IO -c 'w -P 0x11 1m 1m' "$TEST_IMG" | _filter_qemu_io
echo
echo "== check TLS client to plain server fails =="
-nbd_server_start_tcp_socket "$TEST_IMG"
+nbd_server_start_tcp_socket -f $IMGFMT "$TEST_IMG"
$QEMU_IMG info --image-opts \
--object tls-creds-x509,dir=${tls_dir}/client1,endpoint=client,id=tls0 \
@@ -78,7 +78,10 @@ nbd_server_stop
echo
echo "== check plain client to TLS server fails =="
-nbd_server_start_tcp_socket --object
tls-creds-x509,dir=${tls_dir}/server1,endpoint=server,id=tls0,verify-peer=yes
--tls-creds tls0 "$TEST_IMG"
+nbd_server_start_tcp_socket \
+ --object
tls-creds-x509,dir=${tls_dir}/server1,endpoint=server,id=tls0,verify-peer=yes \
+ --tls-creds tls0 \
+ -f $IMGFMT "$TEST_IMG"
$QEMU_IMG info nbd://localhost:$nbd_tcp_port 2>&1 | sed
"s/$nbd_tcp_port/PORT/g"
@@ -104,7 +107,7 @@ $QEMU_IO -c 'r -P 0x11 1m 1m' -c 'w -P 0x22 1m 1m'
--image-opts \
driver=nbd,host=$nbd_tcp_addr,port=$nbd_tcp_port,tls-creds=tls0 \
2>&1 | _filter_qemu_io
-$QEMU_IO -f qcow2 -r -U -c 'r -P 0x22 1m 1m' "$TEST_IMG" | _filter_qemu_io
+$QEMU_IO -f $IMGFMT -r -U -c 'r -P 0x22 1m 1m' "$TEST_IMG" | _filter_qemu_io
# success, all done
echo "*** done"
--
2.19.1
- [Qemu-block] [PULL 00/13] Block layer patches, Kevin Wolf, 2018/11/22
- [Qemu-block] [PULL 01/13] iotests: Replace time.clock() with Timeout, Kevin Wolf, 2018/11/22
- [Qemu-block] [PULL 02/13] iotests: Replace assertEquals() with assertEqual(), Kevin Wolf, 2018/11/22
- [Qemu-block] [PULL 03/13] iotests: Skip 233 if certtool not installed, Kevin Wolf, 2018/11/22
- [Qemu-block] [PULL 04/13] qemu-img: Fix typo, Kevin Wolf, 2018/11/22
- [Qemu-block] [PULL 05/13] qemu-img: Fix leak, Kevin Wolf, 2018/11/22
- [Qemu-block] [PULL 06/13] scsi-disk: Fix crash if underlying host file or disk returns error, Kevin Wolf, 2018/11/22
- [Qemu-block] [PULL 07/13] block: Fix update of BDRV_O_AUTO_RDONLY in update_flags_from_options(), Kevin Wolf, 2018/11/22
- [Qemu-block] [PULL 08/13] iotests: fix nbd test 233 to work correctly with raw images,
Kevin Wolf <=
- [Qemu-block] [PULL 09/13] nvme: call blk_drain in NVMe reset code to avoid lockups, Kevin Wolf, 2018/11/22
- [Qemu-block] [PULL 10/13] nvme: fix out-of-bounds access to the CMB, Kevin Wolf, 2018/11/22
- [Qemu-block] [PULL 11/13] Revert "nvme: fix oob access issue(CVE-2018-16847)", Kevin Wolf, 2018/11/22
- [Qemu-block] [PULL 12/13] nvme: fix bug with PCI IRQ pins on teardown, Kevin Wolf, 2018/11/22
- [Qemu-block] [PULL 13/13] iotests: Enhance 223 to cover multiple bitmap granularities, Kevin Wolf, 2018/11/22
- Re: [Qemu-block] [PULL 00/13] Block layer patches, Peter Maydell, 2018/11/22
- Re: [Qemu-block] [Qemu-devel] [PULL 00/13] Block layer patches, no-reply, 2018/11/23