mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iotests: Add virtio-scsi device helper

Browse Source 
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>
This commit is contained in:
John Snow 2019-07-29 16:35:54 -04:00
parent de263986b5
commit f357576fa9
5 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/qemu-iotests/040
View File

@ -85,11 +85,7 @@ class TestSingleDrive(ImageCommitTestCase):
qemu_io('-f', 'raw', '-c', 'write -P 0xab 0 524288', backing_img) qemu_io('-f', 'raw', '-c', 'write -P 0xab 0 524288', backing_img)
qemu_io('-f', iotests.imgfmt, '-c', 'write -P 0xef 524288 524288', mid_img) qemu_io('-f', iotests.imgfmt, '-c', 'write -P 0xef 524288 524288', mid_img)
self.vm = iotests.VM().add_drive(test_img, "node-name=top,backing.node-name=mid,backing.backing.node-name=base", interface="none") self.vm = iotests.VM().add_drive(test_img, "node-name=top,backing.node-name=mid,backing.backing.node-name=base", interface="none")
if iotests.qemu_default_machine == 's390-ccw-virtio': self.vm.add_device(iotests.get_virtio_scsi_device())
self.vm.add_device("virtio-scsi-ccw")
else:
self.vm.add_device("virtio-scsi-pci")
self.vm.add_device("scsi-hd,id=scsi0,drive=drive0") self.vm.add_device("scsi-hd,id=scsi0,drive=drive0")
self.vm.launch() self.vm.launch()
self.has_quit = False self.has_quit = False

6
tests/qemu-iotests/093
View File

@ -367,10 +367,8 @@ class ThrottleTestGroupNames(iotests.QMPTestCase):
class ThrottleTestRemovableMedia(iotests.QMPTestCase): class ThrottleTestRemovableMedia(iotests.QMPTestCase):
def setUp(self): def setUp(self):
self.vm = iotests.VM() self.vm = iotests.VM()
if iotests.qemu_default_machine == 's390-ccw-virtio': self.vm.add_device("{},id=virtio-scsi".format(
self.vm.add_device("virtio-scsi-ccw,id=virtio-scsi") iotests.get_virtio_scsi_device()))
else:
self.vm.add_device("virtio-scsi-pci,id=virtio-scsi")
self.vm.launch() self.vm.launch()
def tearDown(self): def tearDown(self):

7
tests/qemu-iotests/139
View File

@ -35,11 +35,8 @@ class TestBlockdevDel(iotests.QMPTestCase):
def setUp(self): def setUp(self):
iotests.qemu_img('create', '-f', iotests.imgfmt, base_img, '1M') iotests.qemu_img('create', '-f', iotests.imgfmt, base_img, '1M')
self.vm = iotests.VM() self.vm = iotests.VM()
if iotests.qemu_default_machine == 's390-ccw-virtio': self.vm.add_device("{},id=virtio-scsi".format(
self.vm.add_device("virtio-scsi-ccw,id=virtio-scsi") iotests.get_virtio_scsi_device()))
else:
self.vm.add_device("virtio-scsi-pci,id=virtio-scsi")
self.vm.launch() self.vm.launch()
def tearDown(self): def tearDown(self):

5
tests/qemu-iotests/238
View File

@ -23,10 +23,7 @@ import os
import iotests import iotests
from iotests import log from iotests import log
if iotests.qemu_default_machine == 's390-ccw-virtio': virtio_scsi_device = iotests.get_virtio_scsi_device()
virtio_scsi_device = 'virtio-scsi-ccw'
else:
virtio_scsi_device = 'virtio-scsi-pci'
vm = iotests.VM() vm = iotests.VM()
vm.launch() vm.launch()

4
tests/qemu-iotests/iotests.py
View File

@ -164,6 +164,10 @@ def qemu_io_silent(*args):
(-exitcode, ' '.join(args))) (-exitcode, ' '.join(args)))
return exitcode return exitcode
def get_virtio_scsi_device():
if qemu_default_machine == 's390-ccw-virtio':
return 'virtio-scsi-ccw'
return 'virtio-scsi-pci'
class QemuIoInteractive: class QemuIoInteractive:
def __init__(self, *args): def __init__(self, *args):