Skip to content

Commit

Permalink
iotests: use virtio aliases for 067
Browse files Browse the repository at this point in the history
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 <cohuck@redhat.com>
Reviewed-by: QingFeng Hao <haoqf@linux.vnet.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
  • Loading branch information
cohuck authored and kevmw committed Sep 26, 2017
1 parent 75f02ed commit b1149c1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion tests/qemu-iotests/067
Expand Up @@ -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" } }
Expand Down
2 changes: 1 addition & 1 deletion tests/qemu-iotests/067.out
Expand Up @@ -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
}
Expand Down

0 comments on commit b1149c1

Please sign in to comment.