[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 3/3] iotests: use virtio aliases for 067
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PATCH v2 3/3] iotests: use virtio aliases for 067 |
Date: |
Wed, 13 Sep 2017 11:10:38 +0200 |
The default cpu model on s390x does not provide zPCI, which is
not yet wired up on tcg. Moreover, virtio-ccw is the standard
on s390x.
Using virtio-scsi will implicitly pick the right device, so just
switch to that for simplicity.
Signed-off-by: Cornelia Huck <address@hidden>
---
tests/qemu-iotests/067 | 3 ++-
tests/qemu-iotests/067.out | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067
index 5d4ca4bc61..cbb3da286a 100755
--- a/tests/qemu-iotests/067
+++ b/tests/qemu-iotests/067
@@ -141,7 +141,7 @@ echo
echo === Empty drive with -device and device_del ===
echo
-run_qemu -device virtio-scsi-pci -device scsi-cd,id=cd0 <<EOF
+run_qemu -device virtio-scsi -device scsi-cd,id=cd0 <<EOF
{ "execute": "qmp_capabilities" }
{ "execute": "query-block" }
{ "execute": "device_del", "arguments": { "id": "cd0" } }
@@ -150,6 +150,7 @@ run_qemu -device virtio-scsi-pci -device scsi-cd,id=cd0
<<EOF
{ "execute": "quit" }
EOF
+
# success, all done
echo "*** done"
rm -f $seq.full
diff --git a/tests/qemu-iotests/067.out b/tests/qemu-iotests/067.out
index bd70557ddc..58e83c4505 100644
--- a/tests/qemu-iotests/067.out
+++ b/tests/qemu-iotests/067.out
@@ -419,7 +419,7 @@ Testing:
=== Empty drive with -device and device_del ===
-Testing: -device virtio-scsi-pci -device scsi-cd,id=cd0
+Testing: -device virtio-scsi -device scsi-cd,id=cd0
{
QMP_VERSION
}
--
2.13.5
- [Qemu-devel] [PATCH v2 0/3] iotests: cure s390x failures by switching to ccw/aliases, Cornelia Huck, 2017/09/13
- [Qemu-devel] [PATCH v2 1/3] iotests: use -ccw on s390x for 040, 139, and 182, Cornelia Huck, 2017/09/13
- [Qemu-devel] [PATCH v2 2/3] iotests: use -ccw on s390x for 051, Cornelia Huck, 2017/09/13
- [Qemu-devel] [PATCH v2 3/3] iotests: use virtio aliases for 067,
Cornelia Huck <=
- Re: [Qemu-devel] [PATCH v2 0/3] iotests: cure s390x failures by switching to ccw/aliases, QingFeng Hao, 2017/09/15
- Re: [Qemu-devel] [PATCH v2 0/3] iotests: cure s390x failures by switching to ccw/aliases, Kevin Wolf, 2017/09/15