| Message ID | 20221207131452.8455-1-borntraeger@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/1] qemu-iotests/stream-under-throttle: do not shutdown QEMU | expand |
On 07/12/2022 14.14, Christian Borntraeger wrote: > Without a kernel or boot disk a QEMU on s390 will exit (usually with a > disabled wait state). This breaks the stream-under-throttle test case. > Do not exit qemu if on s390. > > Signed-off-by: Christian Borntraeger <borntraeger@linux.ibm.com> > --- > tests/qemu-iotests/tests/stream-under-throttle | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/tests/qemu-iotests/tests/stream-under-throttle b/tests/qemu-iotests/tests/stream-under-throttle > index 8d2d9e16840d..c24dfbcaa2f2 100755 > --- a/tests/qemu-iotests/tests/stream-under-throttle > +++ b/tests/qemu-iotests/tests/stream-under-throttle > @@ -88,6 +88,8 @@ class TestStreamWithThrottle(iotests.QMPTestCase): > 'x-iops-total=10000,x-bps-total=104857600') > self.vm.add_blockdev(self.vm.qmp_to_opts(blockdev)) > self.vm.add_device('virtio-blk,iothread=iothr0,drive=throttled-node') > + if iotests.qemu_default_machine == 's390-ccw-virtio': > + self.vm.add_args('-no-shutdown') > self.vm.launch() I guess you could even add that unconditionally for all architectures? Anyway: Reviewed-by: Thomas Huth <thuth@redhat.com>
Am 07.12.22 um 14:23 schrieb Thomas Huth: > On 07/12/2022 14.14, Christian Borntraeger wrote: >> Without a kernel or boot disk a QEMU on s390 will exit (usually with a >> disabled wait state). This breaks the stream-under-throttle test case. >> Do not exit qemu if on s390. >> >> Signed-off-by: Christian Borntraeger <borntraeger@linux.ibm.com> >> --- >> tests/qemu-iotests/tests/stream-under-throttle | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/tests/qemu-iotests/tests/stream-under-throttle b/tests/qemu-iotests/tests/stream-under-throttle >> index 8d2d9e16840d..c24dfbcaa2f2 100755 >> --- a/tests/qemu-iotests/tests/stream-under-throttle >> +++ b/tests/qemu-iotests/tests/stream-under-throttle >> @@ -88,6 +88,8 @@ class TestStreamWithThrottle(iotests.QMPTestCase): >> 'x-iops-total=10000,x-bps-total=104857600') >> self.vm.add_blockdev(self.vm.qmp_to_opts(blockdev)) >> self.vm.add_device('virtio-blk,iothread=iothr0,drive=throttled-node') >> + if iotests.qemu_default_machine == 's390-ccw-virtio': >> + self.vm.add_args('-no-shutdown') >> self.vm.launch() > > I guess you could even add that unconditionally for all architectures? maybe. It might even fix other architecture with the same problem. But I dont know if thats the case. So we can start with this fix and then remove the if at a later point in time if necessary/useful. > Anyway: > Reviewed-by: Thomas Huth <thuth@redhat.com> >
Am 07.12.22 um 14:14 schrieb Christian Borntraeger: > Without a kernel or boot disk a QEMU on s390 will exit (usually with a > disabled wait state). This breaks the stream-under-throttle test case. > Do not exit qemu if on s390. > > Signed-off-by: Christian Borntraeger <borntraeger@linux.ibm.com> > --- > tests/qemu-iotests/tests/stream-under-throttle | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/tests/qemu-iotests/tests/stream-under-throttle b/tests/qemu-iotests/tests/stream-under-throttle > index 8d2d9e16840d..c24dfbcaa2f2 100755 > --- a/tests/qemu-iotests/tests/stream-under-throttle > +++ b/tests/qemu-iotests/tests/stream-under-throttle > @@ -88,6 +88,8 @@ class TestStreamWithThrottle(iotests.QMPTestCase): > 'x-iops-total=10000,x-bps-total=104857600') > self.vm.add_blockdev(self.vm.qmp_to_opts(blockdev)) > self.vm.add_device('virtio-blk,iothread=iothr0,drive=throttled-node') > + if iotests.qemu_default_machine == 's390-ccw-virtio': > + self.vm.add_args('-no-shutdown') > self.vm.launch() > > def tearDown(self) -> None: ping. I guess, this will come after the release?
On 12/12/2022 11.13, Christian Borntraeger wrote: > > > Am 07.12.22 um 14:14 schrieb Christian Borntraeger: >> Without a kernel or boot disk a QEMU on s390 will exit (usually with a >> disabled wait state). This breaks the stream-under-throttle test case. >> Do not exit qemu if on s390. >> >> Signed-off-by: Christian Borntraeger <borntraeger@linux.ibm.com> >> --- >> tests/qemu-iotests/tests/stream-under-throttle | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/tests/qemu-iotests/tests/stream-under-throttle >> b/tests/qemu-iotests/tests/stream-under-throttle >> index 8d2d9e16840d..c24dfbcaa2f2 100755 >> --- a/tests/qemu-iotests/tests/stream-under-throttle >> +++ b/tests/qemu-iotests/tests/stream-under-throttle >> @@ -88,6 +88,8 @@ class TestStreamWithThrottle(iotests.QMPTestCase): >> 'x-iops-total=10000,x-bps-total=104857600') >> self.vm.add_blockdev(self.vm.qmp_to_opts(blockdev)) >> >> self.vm.add_device('virtio-blk,iothread=iothr0,drive=throttled-node') >> + if iotests.qemu_default_machine == 's390-ccw-virtio': >> + self.vm.add_args('-no-shutdown') >> self.vm.launch() >> def tearDown(self) -> None: > > > ping. I guess, this will come after the release? Since it is related to s390x, I can take it through my s390x branch. Thomas
Am 07.12.2022 um 14:14 hat Christian Borntraeger geschrieben: > Without a kernel or boot disk a QEMU on s390 will exit (usually with a > disabled wait state). This breaks the stream-under-throttle test case. > Do not exit qemu if on s390. > > Signed-off-by: Christian Borntraeger <borntraeger@linux.ibm.com> Thanks, applied to the block branch. Kevin
diff --git a/tests/qemu-iotests/tests/stream-under-throttle b/tests/qemu-iotests/tests/stream-under-throttle index 8d2d9e16840d..c24dfbcaa2f2 100755 --- a/tests/qemu-iotests/tests/stream-under-throttle +++ b/tests/qemu-iotests/tests/stream-under-throttle @@ -88,6 +88,8 @@ class TestStreamWithThrottle(iotests.QMPTestCase): 'x-iops-total=10000,x-bps-total=104857600') self.vm.add_blockdev(self.vm.qmp_to_opts(blockdev)) self.vm.add_device('virtio-blk,iothread=iothr0,drive=throttled-node') + if iotests.qemu_default_machine == 's390-ccw-virtio': + self.vm.add_args('-no-shutdown') self.vm.launch() def tearDown(self) -> None:
Without a kernel or boot disk a QEMU on s390 will exit (usually with a disabled wait state). This breaks the stream-under-throttle test case. Do not exit qemu if on s390. Signed-off-by: Christian Borntraeger <borntraeger@linux.ibm.com> --- tests/qemu-iotests/tests/stream-under-throttle | 2 ++ 1 file changed, 2 insertions(+)