On 13.09.2017 11:10, Cornelia Huck wrote:
> 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 <kw...@redhat.com>
> Signed-off-by: Cornelia Huck <coh...@redhat.com>
> ---
> tests/qemu-iotests/040 | 6 +++++-
> tests/qemu-iotests/139 | 12 ++++++++++--
> tests/qemu-iotests/182 | 13 +++++++++++--
> 3 files changed, 26 insertions(+), 5 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()
>
> diff --git a/tests/qemu-iotests/139 b/tests/qemu-iotests/139
> index 50cf40fbd5..f8f02808a9 100644
> --- a/tests/qemu-iotests/139
> +++ b/tests/qemu-iotests/139
> @@ -25,13 +25,21 @@ import time
>
> base_img = os.path.join(iotests.test_dir, 'base.img')
> new_img = os.path.join(iotests.test_dir, 'new.img')
> +if iotests.qemu_default_machine == 's390-ccw-virtio':
> + default_virtio_blk = 'virtio-blk-ccw'
> +else:
> + default_virtio_blk = 'virtio-blk-pci'
simply "virtio_blk" ?
>
> class TestBlockdevDel(iotests.QMPTestCase):
>
> def setUp(self):
> iotests.qemu_img('create', '-f', iotests.imgfmt, base_img, '1M')
> self.vm = iotests.VM()
> - self.vm.add_device("virtio-scsi-pci,id=virtio-scsi")
> + 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.launch()
>
> def tearDown(self):
> @@ -87,7 +95,7 @@ class TestBlockdevDel(iotests.QMPTestCase):
> self.checkBlockDriverState(node, expect_error)
>
> # Add a device model
> - def addDeviceModel(self, device, backend, driver = 'virtio-blk-pci'):
> + def addDeviceModel(self, device, backend, driver = default_virtio_blk):
> result = self.vm.qmp('device_add', id = device,
> driver = driver, drive = backend)
> self.assert_qmp(result, 'return', {})
> diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182
> index 7ecbb22604..2e078ceed8 100755
> --- a/tests/qemu-iotests/182
> +++ b/tests/qemu-iotests/182
> @@ -45,17 +45,26 @@ _supported_os Linux
>
> size=32M
>
> +case "$QEMU_DEFAULT_MACHINE" in
> + s390-ccw-virtio)
> + virtioblk=virtio-blk-ccw
> + ;;
> + *)
> + virtioblk=virtio-blk-pci
s/virtioblk/virtio_blk/ ?
(due to "virtio_scsi" in next patch)
> + ;;
> +esac
> +
> _make_test_img $size
>
> echo "Starting QEMU"
> _launch_qemu -drive file=$TEST_IMG,if=none,id=drive0,file.locking=on \
> - -device virtio-blk-pci,drive=drive0
> + -device $virtioblk,drive=drive0
>
> echo
> echo "Starting a second QEMU using the same image should fail"
> echo 'quit' | $QEMU -monitor stdio \
> -drive file=$TEST_IMG,if=none,id=drive0,file.locking=on \
> - -device virtio-blk-pci,drive=drive0 2>&1 | _filter_testdir 2>&1 |
> + -device $virtioblk,drive=drive0 2>&1 | _filter_testdir 2>&1 |
> _filter_qemu |
> sed -e '/falling back to POSIX file/d' \
> -e '/locks can be lost unexpectedly/d'
>
--
Thanks,
David
