qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH 1/1] iotests: make 235 work on s390 (and others)
@ 2018-12-05  8:43 Christian Borntraeger
  2018-12-05 15:34 ` Eric Blake
  0 siblings, 1 reply; 3+ messages in thread
From: Christian Borntraeger @ 2018-12-05  8:43 UTC (permalink / raw)
  To: Vladimir Sementsov-Ogievskiy, Max Reitz
  Cc: qemu-devel, qemu-s390x, qemu-block, Kevin Wolf,
	Christian Borntraeger

"-machine pc" will not work all architectures. Lets fall back to the
default machine by not specifying it.

In addition we also need to specify -no-shutdown on s390 as qemu will
exit otherwise.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
 tests/qemu-iotests/235 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/235 b/tests/qemu-iotests/235
index da044ed34e..d6edd97ab4 100755
--- a/tests/qemu-iotests/235
+++ b/tests/qemu-iotests/235
@@ -49,7 +49,9 @@ qemu_img_create('-f', iotests.imgfmt, '-o', 'preallocation=metadata', disk,
                 str(size))
 
 vm = QEMUMachine(iotests.qemu_prog)
-vm.add_args('-machine', 'pc,accel=kvm')
+vm.add_args('-machine', 'accel=kvm')
+if iotests.qemu_default_machine == 's390-ccw-virtio':
+        vm.add_args('-no-shutdown')
 vm.add_args('-drive', 'id=src,file=' + disk)
 vm.launch()
 
-- 
2.19.1

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

* Re: [Qemu-devel] [PATCH 1/1] iotests: make 235 work on s390 (and others)
  2018-12-05  8:43 [Qemu-devel] [PATCH 1/1] iotests: make 235 work on s390 (and others) Christian Borntraeger
@ 2018-12-05 15:34 ` Eric Blake
  2018-12-07 12:12   ` Kevin Wolf
  0 siblings, 1 reply; 3+ messages in thread
From: Eric Blake @ 2018-12-05 15:34 UTC (permalink / raw)
  To: Christian Borntraeger, Vladimir Sementsov-Ogievskiy, Max Reitz
  Cc: Kevin Wolf, qemu-s390x, qemu-devel, qemu-block, qemu-stable

On 12/5/18 2:43 AM, Christian Borntraeger wrote:
> "-machine pc" will not work all architectures. Lets fall back to the
> default machine by not specifying it.
> 
> In addition we also need to specify -no-shutdown on s390 as qemu will
> exit otherwise.
> 
> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>

CC: qemu-stable

> ---
>   tests/qemu-iotests/235 | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)

Reviewed-by: Eric Blake <eblake@redhat.com>

Too late for 3.1; for that, we can just document that there are known 
iotests failures under some configurations

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org

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

* Re: [Qemu-devel] [PATCH 1/1] iotests: make 235 work on s390 (and others)
  2018-12-05 15:34 ` Eric Blake
@ 2018-12-07 12:12   ` Kevin Wolf
  0 siblings, 0 replies; 3+ messages in thread
From: Kevin Wolf @ 2018-12-07 12:12 UTC (permalink / raw)
  To: Eric Blake
  Cc: Christian Borntraeger, Vladimir Sementsov-Ogievskiy, Max Reitz,
	qemu-s390x, qemu-devel, qemu-block, qemu-stable

Am 05.12.2018 um 16:34 hat Eric Blake geschrieben:
> On 12/5/18 2:43 AM, Christian Borntraeger wrote:
> > "-machine pc" will not work all architectures. Lets fall back to the
> > default machine by not specifying it.
> > 
> > In addition we also need to specify -no-shutdown on s390 as qemu will
> > exit otherwise.
> > 
> > Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
> 
> CC: qemu-stable
> 
> > ---
> >   tests/qemu-iotests/235 | 4 +++-
> >   1 file changed, 3 insertions(+), 1 deletion(-)
> 
> Reviewed-by: Eric Blake <eblake@redhat.com>
> 
> Too late for 3.1; for that, we can just document that there are known
> iotests failures under some configurations

Thanks, applied to the block-next branch.

Kevin

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

end of thread, other threads:[~2018-12-07 12:12 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-05  8:43 [Qemu-devel] [PATCH 1/1] iotests: make 235 work on s390 (and others) Christian Borntraeger
2018-12-05 15:34 ` Eric Blake
2018-12-07 12:12   ` 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).