Re: [Qemu-block] [Qemu-devel] [PATCH 2/3] iotests: use -ccw on s390x for 051
Am 12.09.2017 um 18:05 hat Cornelia Huck geschrieben: > On Fri, 8 Sep 2017 17:55:29 +0200 > Thomas Huth wrote: > > > On 08.09.2017 13:54, Kevin Wolf wrote: > > > Am 08.09.2017 um 13:24 hat Cornelia Huck geschrieben: > > >> On Fri, 8 Sep 2017 13:04:25 +0200 > > >> Kevin Wolf 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 > > --- > > 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. > > > > FWIW, as far as I know, Lukáš is running this test also on ppc64 in our > > weekly regression run. So it would be good to keep that working, please :-) > > > > >> 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. > > > > Maybe we should even use it in a couple of places on purpose - so we get > > some test coverage for them? > > FWIW, using the the sed post-run filtering works well for 051, but it > is driving me bonkers on 067 (or maybe I should just call it a day...) > > We could use the sed approach for 051 and the alias approach on 067 - > that way we would also test aliases :) > > Any preferences by the iotest maintainers? Sure, that works for me. I'm happy with anything that works and doesn't split the reference output in two versions. (Not splitting is also in your own interest; if anything bitrots, it's the non-pc version.) Kevin
Re: [Qemu-block] [Qemu-devel] [PATCH 2/3] iotests: use -ccw on s390x for 051
On Fri, 8 Sep 2017 17:55:29 +0200 Thomas Huth wrote: > On 08.09.2017 13:54, Kevin Wolf wrote: > > Am 08.09.2017 um 13:24 hat Cornelia Huck geschrieben: > >> On Fri, 8 Sep 2017 13:04:25 +0200 > >> Kevin Wolf 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 > --- > 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. > > FWIW, as far as I know, Lukáš is running this test also on ppc64 in our > weekly regression run. So it would be good to keep that working, please :-) > > >> 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. > > Maybe we should even use it in a couple of places on purpose - so we get > some test coverage for them? FWIW, using the the sed post-run filtering works well for 051, but it is driving me bonkers on 067 (or maybe I should just call it a day...) We could use the sed approach for 051 and the alias approach on 067 - that way we would also test aliases :) Any preferences by the iotest maintainers? [I'd be happy if iotests worked again on s390x...]
Re: [Qemu-block] [Qemu-devel] [PATCH 2/3] iotests: use -ccw on s390x for 051
Dne 8.9.2017 v 17:55 Thomas Huth napsal(a): > On 08.09.2017 13:54, Kevin Wolf wrote: >> Am 08.09.2017 um 13:24 hat Cornelia Huck geschrieben: >>> On Fri, 8 Sep 2017 13:04:25 +0200 >>> Kevin Wolf 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 > --- > 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. > > FWIW, as far as I know, Lukáš is running this test also on ppc64 in our > weekly regression run. So it would be good to keep that working, please :-) > Yes, works well on ppc64(le) and would be nice to keep it that way... Lukáš >>> 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. > > Maybe we should even use it in a couple of places on purpose - so we get > some test coverage for them? > > Thomas > signature.asc Description: OpenPGP digital signature
Re: [Qemu-block] [Qemu-devel] [PATCH 2/3] iotests: use -ccw on s390x for 051
On 08.09.2017 13:54, Kevin Wolf wrote: > Am 08.09.2017 um 13:24 hat Cornelia Huck geschrieben: >> On Fri, 8 Sep 2017 13:04:25 +0200 >> Kevin Wolf 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 --- 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. FWIW, as far as I know, Lukáš is running this test also on ppc64 in our weekly regression run. So it would be good to keep that working, please :-) >> 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. Maybe we should even use it in a couple of places on purpose - so we get some test coverage for them? Thomas
Re: [Qemu-block] [Qemu-devel] [PATCH 2/3] iotests: use -ccw on s390x for 051
在 2017/9/6 15:32, Cornelia Huck 写道: On Wed, 6 Sep 2017 15:19:01 +0800 QingFeng Hao wrote: 在 2017/9/5 23:16, Cornelia Huck 写道: 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 --- 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 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 echo echo === Overriding backing file === Regarding the new output file, I have a doubt that why there is no change on "check" script where the result check is located: if diff -w "$reference" $tmp.out >/dev/null 2>&1 Got it. It makes sense. The right output reference should be picked as of commit e166b4148208656635ea2fe39df8b1e875a34fb8 Author: Bo Tu Date: Fri Jul 3 15:28:46 2015 +0800 qemu-iotests: qemu machine type support This patch adds qemu machine type support to the io test suite. Based on the qemu default machine type and alias of the default machine type the reference output file can now vary from the default to a machine specific output file if necessary. When using a machine specific reference file if the default machine has an alias then use the alias as the output file name otherwise use the default machine name as the output file name. Reviewed-by: Max Reitz Reviewed-by: Michael Mueller Reviewed-by: Sascha Silbe Signed-off-by: Xiao Guang Chen Signed-off-by: Kevin Wolf -- Regards QingFeng Hao
Re: [Qemu-block] [Qemu-devel] [PATCH 2/3] iotests: use -ccw on s390x for 051
On Wed, 6 Sep 2017 15:19:01 +0800 QingFeng Hao wrote: > 在 2017/9/5 23:16, Cornelia Huck 写道: > > 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 > > --- > > 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 > > > > 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 > > > > echo > > echo === Overriding backing file === > Regarding the new output file, I have a doubt that why there is no > change on "check" > script where the result check is located: > if diff -w "$reference" $tmp.out >/dev/null 2>&1 The right output reference should be picked as of commit e166b4148208656635ea2fe39df8b1e875a34fb8 Author: Bo Tu Date: Fri Jul 3 15:28:46 2015 +0800 qemu-iotests: qemu machine type support This patch adds qemu machine type support to the io test suite. Based on the qemu default machine type and alias of the default machine type the reference output file can now vary from the default to a machine specific output file if necessary. When using a machine specific reference file if the default machine has an alias then use the alias as the output file name otherwise use the default machine name as the output file name. Reviewed-by: Max Reitz Reviewed-by: Michael Mueller Reviewed-by: Sascha Silbe Signed-off-by: Xiao Guang Chen Signed-off-by: Kevin Wolf
Re: [Qemu-block] [Qemu-devel] [PATCH 2/3] iotests: use -ccw on s390x for 051
在 2017/9/5 23:16, Cornelia Huck 写道: 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 --- 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 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 echo echo === Overriding backing file === Regarding the new output file, I have a doubt that why there is no change on "check" script where the result check is located: if diff -w "$reference" $tmp.out >/dev/null 2>&1 Thanks! diff --git a/tests/qemu-iotests/051.s390-ccw-virtio.out b/tests/qemu-iotests/051.s390-ccw-virtio.out new file mode 100644 index 00..7555f0b73e --- /dev/null +++ b/tests/qemu-iotests/051.s390-ccw-virtio.out [...] -- Regards QingFeng Hao
