On Wed, 6 Sep 2017 14:57:48 +0800 QingFeng Hao <ha...@linux.vnet.ibm.com> wrote:
> 在 2017/9/5 23:16, Cornelia Huck 写道: > > Recent changes in s390x made pci support dependant on the zpci cpu > > feature, which is not provided on all models (and not on by default). > > This means we cannot instatiate pci devices on a standard qemu > > invocation for s390x. Moreover, the zpci instructions are not even > > wired up for tcg yet, so actually doing anything with those pci devices > > is bound to fail on tcg. > > > > Let's follow the existing example in 068 and switch to the (default) > > virtio-ccw transport on s390x. The changes for 051 and 067 are split > > out as they require adding an output file for s390x (the actual command > > lines are part of the output). > We also found this error and YiMin suggested to change the code in ccw_init > as below: > > if (pci_available) { > DeviceState *dev = qdev_create(NULL, TYPE_S390_PCI_HOST_BRIDGE); > ... > } > We tested it and it can make the 5 cases passed. > How do you think this? :-) I can take a look at this. But I think we want to prefer ccw for s390x in the tests in any case, for the reasons stated above. > Thanks! > > > > > Cornelia Huck (3): > > iotests: use -ccw on s390x for 040, 139, and 182 > > iotests: use -ccw on s390x for 051 > > iotests: use -ccw on s390x for 067 > > > > tests/qemu-iotests/040 | 6 +- > > tests/qemu-iotests/051 | 9 +- > > tests/qemu-iotests/051.s390-ccw-virtio.out | 434 > > +++++++++++++++++++++++++++ > > tests/qemu-iotests/067 | 11 +- > > tests/qemu-iotests/067.s390-ccw-virtio.out | 458 > > +++++++++++++++++++++++++++++ > > tests/qemu-iotests/139 | 12 +- > > tests/qemu-iotests/182 | 13 +- > > 7 files changed, 936 insertions(+), 7 deletions(-) > > create mode 100644 tests/qemu-iotests/051.s390-ccw-virtio.out > > create mode 100644 tests/qemu-iotests/067.s390-ccw-virtio.out > > >