22329f0d29
Commit f1d5516ab583 introduces a test in some iotests to check if the machine is a s390-ccw-virtio and to select virtio-*-ccw rather than virtio-*-pci. We don't need that because QEMU already provides aliases to use the correct virtio interface according to the machine type. This patch removes all virtio-*-pci and virtio-*-ccw to use virtio-* instead and remove get_virtio_scsi_device(). This also enables virtio-mmio devices (virtio-*-device) Signed-off-by: Laurent Vivier <laurent@vivier.eu> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Cornelia Huck <cohuck@redhat.com> Message-Id: <20210319202335.2397060-5-laurent@vivier.eu> Message-Id: <20210323165308.15244-20-alex.bennee@linaro.org>
41 lines
1.4 KiB
Python
Executable File
41 lines
1.4 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
# group: quick
|
|
#
|
|
# Regression test for throttle group member unregister segfault with iothread
|
|
#
|
|
# Copyright (c) 2019 Red Hat, Inc.
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 2 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
#
|
|
|
|
import sys
|
|
import os
|
|
import iotests
|
|
from iotests import log
|
|
|
|
iotests.script_initialize()
|
|
|
|
vm = iotests.VM()
|
|
vm.launch()
|
|
|
|
log(vm.qmp('blockdev-add', node_name='hd0', driver='null-co', read_zeroes=True))
|
|
log(vm.qmp('object-add', qom_type='iothread', id='iothread0'))
|
|
log(vm.qmp('device_add', id='scsi0', driver='virtio-scsi', iothread='iothread0'))
|
|
log(vm.qmp('device_add', id='scsi-hd0', driver='scsi-hd', drive='hd0'))
|
|
log(vm.qmp('block_set_io_throttle', id='scsi-hd0', bps=0, bps_rd=0, bps_wr=0,
|
|
iops=1000, iops_rd=0, iops_wr=0, conv_keys=False))
|
|
log(vm.qmp('device_del', id='scsi-hd0'))
|
|
|
|
vm.shutdown()
|