aboutsummaryrefslogtreecommitdiff
path: root/tests/qemu-iotests/139
diff options
context:
space:
mode:
authorJohn Snow <jsnow@redhat.com>2019-07-29 16:35:54 -0400
committerJohn Snow <jsnow@redhat.com>2019-08-16 16:28:02 -0400
commitf357576fa9cfc6413a9629145dbe2e56a11d7e0d (patch)
tree4b705782fc1f2f76d6568ea0ce5b34f6a77ec384 /tests/qemu-iotests/139
parentde263986b5dc7571d12a95305ffc7ddd2f349431 (diff)
downloadqemu-f357576fa9cfc6413a9629145dbe2e56a11d7e0d.zip
qemu-f357576fa9cfc6413a9629145dbe2e56a11d7e0d.tar.gz
qemu-f357576fa9cfc6413a9629145dbe2e56a11d7e0d.tar.bz2
iotests: Add virtio-scsi device helper
Seems that it comes up enough. Signed-off-by: John Snow <jsnow@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Message-id: 20190709232550.10724-17-jsnow@redhat.com Signed-off-by: John Snow <jsnow@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/139')
-rwxr-xr-xtests/qemu-iotests/1397
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/qemu-iotests/139 b/tests/qemu-iotests/139
index 933b451..2176ea5 100755
--- a/tests/qemu-iotests/139
+++ b/tests/qemu-iotests/139
@@ -35,11 +35,8 @@ class TestBlockdevDel(iotests.QMPTestCase):
def setUp(self):
iotests.qemu_img('create', '-f', iotests.imgfmt, base_img, '1M')
self.vm = iotests.VM()
- if iotests.qemu_default_machine == 's390-ccw-virtio':
- self.vm.add_device("virtio-scsi-ccw,id=virtio-scsi")
- else:
- self.vm.add_device("virtio-scsi-pci,id=virtio-scsi")
-
+ self.vm.add_device("{},id=virtio-scsi".format(
+ iotests.get_virtio_scsi_device()))
self.vm.launch()
def tearDown(self):