[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 16/18] iotests: Add virtio-scsi device helper
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v4 16/18] iotests: Add virtio-scsi device helper |
Date: |
Tue, 9 Jul 2019 19:25:48 -0400 |
Seems that it comes up enough.
Signed-off-by: John Snow <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/040 | 6 +-----
tests/qemu-iotests/093 | 6 ++----
tests/qemu-iotests/139 | 7 ++-----
tests/qemu-iotests/238 | 5 +----
tests/qemu-iotests/iotests.py | 4 ++++
5 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040
index b81133a474..657b37103c 100755
--- a/tests/qemu-iotests/040
+++ b/tests/qemu-iotests/040
@@ -85,11 +85,7 @@ class TestSingleDrive(ImageCommitTestCase):
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)
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("virtio-scsi-ccw")
- else:
- self.vm.add_device("virtio-scsi-pci")
-
+ self.vm.add_device(iotests.get_virtio_scsi_device())
self.vm.add_device("scsi-hd,id=scsi0,drive=drive0")
self.vm.launch()
diff --git a/tests/qemu-iotests/093 b/tests/qemu-iotests/093
index d88fbc182e..46153220f8 100755
--- a/tests/qemu-iotests/093
+++ b/tests/qemu-iotests/093
@@ -366,10 +366,8 @@ class ThrottleTestGroupNames(iotests.QMPTestCase):
class ThrottleTestRemovableMedia(iotests.QMPTestCase):
def setUp(self):
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):
diff --git a/tests/qemu-iotests/139 b/tests/qemu-iotests/139
index 933b45121a..2176ea51ba 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):
diff --git a/tests/qemu-iotests/238 b/tests/qemu-iotests/238
index 1c0a46fa90..387a77b2cd 100755
--- a/tests/qemu-iotests/238
+++ b/tests/qemu-iotests/238
@@ -23,10 +23,7 @@ import os
import iotests
from iotests import log
-if iotests.qemu_default_machine == 's390-ccw-virtio':
- virtio_scsi_device = 'virtio-scsi-ccw'
-else:
- virtio_scsi_device = 'virtio-scsi-pci'
+virtio_scsi_device = iotests.get_virtio_scsi_device()
vm = iotests.VM()
vm.launch()
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 6135c9663d..8ae7bc353e 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -164,6 +164,10 @@ def qemu_io_silent(*args):
(-exitcode, ' '.join(args)))
return exitcode
+def get_virtio_scsi_device():
+ if qemu_default_machine == 's390-ccw-virtio':
+ return 'virtio-scsi-ccw'
+ return 'virtio-scsi-pci'
class QemuIoInteractive:
def __init__(self, *args):
--
2.21.0
- Re: [Qemu-devel] [PATCH v4 04/18] qapi: add BitmapSyncMode enum, (continued)
- [Qemu-devel] [PATCH v4 02/18] drive-backup: create do_backup_common, John Snow, 2019/07/09
- [Qemu-devel] [PATCH v4 10/18] block/dirty-bitmap: add bdrv_dirty_bitmap_get, John Snow, 2019/07/09
- [Qemu-devel] [PATCH v4 01/18] qapi/block-core: Introduce BackupCommon, John Snow, 2019/07/09
- [Qemu-devel] [PATCH v4 13/18] iotests: add testing shim for script-style python tests, John Snow, 2019/07/09
- [Qemu-devel] [PATCH v4 14/18] iotests: teach run_job to cancel pending jobs, John Snow, 2019/07/09
- [Qemu-devel] [PATCH v4 12/18] block/backup: add 'always' bitmap sync policy, John Snow, 2019/07/09
- [Qemu-devel] [PATCH v4 15/18] iotests: teach FilePath to produce multiple paths, John Snow, 2019/07/09
- [Qemu-devel] [PATCH v4 16/18] iotests: Add virtio-scsi device helper,
John Snow <=
- [Qemu-devel] [PATCH v4 11/18] block/backup: upgrade copy_bitmap to BdrvDirtyBitmap, John Snow, 2019/07/09
- [Qemu-devel] [PATCH v4 05/18] block/backup: Add mirror sync mode 'bitmap', John Snow, 2019/07/09
- [Qemu-devel] [PATCH v4 09/18] block/dirty-bitmap: add bdrv_dirty_bitmap_merge_internal, John Snow, 2019/07/09
- [Qemu-devel] [PATCH v4 18/18] block/backup: loosen restriction on readonly bitmaps, John Snow, 2019/07/09
- [Qemu-devel] [PATCH v4 17/18] iotests: add test 257 for bitmap-mode backups, John Snow, 2019/07/09
- Re: [Qemu-devel] [PATCH v4 00/18] bitmaps: introduce 'bitmap' sync mode, Max Reitz, 2019/07/10