qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/1] qemu-iotests/stream-under-throttle: do not shutdown QEMU
@ 2022-12-07 13:14 Christian Borntraeger
  2022-12-07 13:23 ` Thomas Huth
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Christian Borntraeger @ 2022-12-07 13:14 UTC (permalink / raw)
  To: qemu-devel, hreitz
  Cc: qemu-s390x, Thomas Huth, Cornelia Huck, David Hildenbrand,
	Richard Henderson, Ilya Leoshkevich, kwolf, qemu-block

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:
-- 
2.38.1



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/1] qemu-iotests/stream-under-throttle: do not shutdown QEMU
  2022-12-07 13:14 [PATCH 1/1] qemu-iotests/stream-under-throttle: do not shutdown QEMU Christian Borntraeger
@ 2022-12-07 13:23 ` Thomas Huth
  2022-12-07 14:07   ` Christian Borntraeger
  2022-12-12 10:13 ` Christian Borntraeger
  2023-01-10 13:21 ` Kevin Wolf
  2 siblings, 1 reply; 6+ messages in thread
From: Thomas Huth @ 2022-12-07 13:23 UTC (permalink / raw)
  To: Christian Borntraeger, qemu-devel, hreitz
  Cc: qemu-s390x, Cornelia Huck, David Hildenbrand, Richard Henderson,
	Ilya Leoshkevich, kwolf, qemu-block

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>



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/1] qemu-iotests/stream-under-throttle: do not shutdown QEMU
  2022-12-07 13:23 ` Thomas Huth
@ 2022-12-07 14:07   ` Christian Borntraeger
  0 siblings, 0 replies; 6+ messages in thread
From: Christian Borntraeger @ 2022-12-07 14:07 UTC (permalink / raw)
  To: Thomas Huth, qemu-devel, hreitz
  Cc: qemu-s390x, Cornelia Huck, David Hildenbrand, Richard Henderson,
	Ilya Leoshkevich, kwolf, qemu-block



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>
> 


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/1] qemu-iotests/stream-under-throttle: do not shutdown QEMU
  2022-12-07 13:14 [PATCH 1/1] qemu-iotests/stream-under-throttle: do not shutdown QEMU Christian Borntraeger
  2022-12-07 13:23 ` Thomas Huth
@ 2022-12-12 10:13 ` Christian Borntraeger
  2023-01-04 10:10   ` Thomas Huth
  2023-01-10 13:21 ` Kevin Wolf
  2 siblings, 1 reply; 6+ messages in thread
From: Christian Borntraeger @ 2022-12-12 10:13 UTC (permalink / raw)
  To: qemu-devel, hreitz
  Cc: qemu-s390x, Thomas Huth, Cornelia Huck, David Hildenbrand,
	Richard Henderson, Ilya Leoshkevich, kwolf, qemu-block



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?


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/1] qemu-iotests/stream-under-throttle: do not shutdown QEMU
  2022-12-12 10:13 ` Christian Borntraeger
@ 2023-01-04 10:10   ` Thomas Huth
  0 siblings, 0 replies; 6+ messages in thread
From: Thomas Huth @ 2023-01-04 10:10 UTC (permalink / raw)
  To: Christian Borntraeger, qemu-devel, hreitz
  Cc: qemu-s390x, Cornelia Huck, David Hildenbrand, Richard Henderson,
	Ilya Leoshkevich, kwolf, qemu-block

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



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/1] qemu-iotests/stream-under-throttle: do not shutdown QEMU
  2022-12-07 13:14 [PATCH 1/1] qemu-iotests/stream-under-throttle: do not shutdown QEMU Christian Borntraeger
  2022-12-07 13:23 ` Thomas Huth
  2022-12-12 10:13 ` Christian Borntraeger
@ 2023-01-10 13:21 ` Kevin Wolf
  2 siblings, 0 replies; 6+ messages in thread
From: Kevin Wolf @ 2023-01-10 13:21 UTC (permalink / raw)
  To: Christian Borntraeger
  Cc: qemu-devel, hreitz, qemu-s390x, Thomas Huth, Cornelia Huck,
	David Hildenbrand, Richard Henderson, Ilya Leoshkevich,
	qemu-block

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



^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2023-01-10 15:52 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-07 13:14 [PATCH 1/1] qemu-iotests/stream-under-throttle: do not shutdown QEMU Christian Borntraeger
2022-12-07 13:23 ` Thomas Huth
2022-12-07 14:07   ` Christian Borntraeger
2022-12-12 10:13 ` Christian Borntraeger
2023-01-04 10:10   ` Thomas Huth
2023-01-10 13:21 ` Kevin Wolf

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).