Am 08.09.2017 um 13:24 hat Cornelia Huck geschrieben: > On Fri, 8 Sep 2017 13:04:25 +0200 > Kevin Wolf <kw...@redhat.com> wrote: > > > Am 05.09.2017 um 17:16 hat Cornelia Huck geschrieben: > > > 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. > > > > > > Provide an output file for s390x. > > > > > > Signed-off-by: Cornelia Huck <coh...@redhat.com> > > > --- > > > tests/qemu-iotests/051 | 9 +- > > > tests/qemu-iotests/051.s390-ccw-virtio.out | 434 > > > +++++++++++++++++++++++++++++ > > > 2 files changed, 442 insertions(+), 1 deletion(-) > > > create mode 100644 tests/qemu-iotests/051.s390-ccw-virtio.out > > > > It's already a pain to have two separate output files for 051, let's try > > to avoid adding a third one. Even more so since I think that the split > > between 051.out and 051.pc.out was already made for s390, so I'm not > > sure if anyone would actually still make use of the plain 051.out > > output if s390 got it's own one. > > Are there no non-pc and non-s390 machines for which this is run?
Who knows? But I'm not aware of anyone who is interested in something else and has contributed to the test cases until now. > > > diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 > > > index c8cfc764bc..f6ad0f4f0b 100755 > > > --- a/tests/qemu-iotests/051 > > > +++ b/tests/qemu-iotests/051 > > > @@ -103,7 +103,14 @@ echo > > > echo === Device without drive === > > > echo > > > > > > -run_qemu -device virtio-scsi-pci -device scsi-hd > > > +case "$QEMU_DEFAULT_MACHINE" in > > > + s390-ccw-virtio) > > > + run_qemu -device virtio-scsi-ccw -device scsi-hd > > > + ;; > > > + *) > > > + run_qemu -device virtio-scsi-pci -device scsi-hd > > > + ;; > > > +esac > > > > The only real difference between 051.out and 051.s390-ccw-virtio.out is > > in this one command line. So if we don't want to just skip this part of > > the test for non-pc like we already skip ther parts, > > I don't think there's a reason to skip this: The only difference is > that we (currently) don't have a by-default usable virtio-pci > implementation on s390 - but any virtio transport should do. Well, any SCSI controller should do, really. Or in fact, any block device that doesn't have removable media. I agree that there's no real reason to skip the test for s390. On the other hand, testing it on s390 doesn't really contribute anything to the test coverage as long as the suite is run for PC, too (because there is nothing machine dependent in the tested code path), so not running it would be tolerable. > Another approach would be to drop the -pci postfix, but I don't want to > introduce more usage of aliases. Maybe that would indeed be the easiest way. As long as we don't intend to remove the alias from qemu, there's no reason not to use it in tests. > > we generally solve > > this kind of thing by just filtering out strings that differ between > > setups. > > > > For example: > > > > case "$QEMU_DEFAULT_MACHINE" in > > s390-ccw-virtio) > > virtio_scsi=virtio-scsi-ccw > > ;; > > *) > > virtio_scsi=virtio-scsi-pci > > ;; > > esac > > > > run_qemu -device $virtio_scsi -device scsi-hd | > > sed -e "s/$virtio_scsi/VIRTIO-SCSI/" > > Yes, I can try this. Kevin
