diff options
| author | Cornelia Huck <cohuck@redhat.com> | 2017-09-13 11:10:36 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2017-09-26 14:46:23 +0200 |
| commit | f1d5516ab583130157852fe475f96fd7cce227c3 (patch) | |
| tree | 114007bc68e6f5e172699697753a3fcb31795674 /tests/qemu-iotests/040 | |
| parent | 78aa8aa019b999ec07b62b322c1280a8250e44ac (diff) | |
| download | qemu-f1d5516ab583130157852fe475f96fd7cce227c3.zip | |
iotests: use -ccw on s390x for 040, 139, and 182
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, so use the -ccw instead of the -pci versions of virtio
devices on s390x.
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: QingFeng Hao <haoqf@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/040')
| -rwxr-xr-x | tests/qemu-iotests/040 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040 index 95b7510571..c284d08796 100755 --- a/tests/qemu-iotests/040 +++ b/tests/qemu-iotests/040 @@ -82,7 +82,11 @@ 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") - self.vm.add_device("virtio-scsi-pci") + 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("scsi-hd,id=scsi0,drive=drive0") self.vm.launch() |