From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47926) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTXQp-0000nB-Vr for qemu-devel@nongnu.org; Wed, 10 Feb 2016 11:15:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aTXQp-0007XW-1D for qemu-devel@nongnu.org; Wed, 10 Feb 2016 11:15:55 -0500 References: <1455023713-104799-1-git-send-email-silbe@linux.vnet.ibm.com> <1455023713-104799-4-git-send-email-silbe@linux.vnet.ibm.com> From: Max Reitz Message-ID: <56BB6231.3060103@redhat.com> Date: Wed, 10 Feb 2016 17:15:45 +0100 MIME-Version: 1.0 In-Reply-To: <1455023713-104799-4-git-send-email-silbe@linux.vnet.ibm.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="BFsfulhFuMcReTVH4sIIs1clcl62eCtr2" Subject: Re: [Qemu-devel] [PATCH 3/3] qemu-iotests: 140: use virtio-scsi instead of IDE List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Sascha Silbe , qemu-devel@nongnu.org, Alexander Graf , Kevin Wolf , qemu-block@nongnu.org Cc: Tu Bo This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --BFsfulhFuMcReTVH4sIIs1clcl62eCtr2 Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: quoted-printable On 09.02.2016 14:15, Sascha Silbe wrote: > IDE is only implemented by very few architectures (mostly PC). Use > virtio-scsi instead so the test works on all architectures that > support virtio. In particular, this fixes qemu-iotests on s390x. >=20 > Fixes: 16dee418 ("iotests: Add test for eject under NBD server") > Signed-off-by: Sascha Silbe > --- > tests/qemu-iotests/140 | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/tests/qemu-iotests/140 b/tests/qemu-iotests/140 > index f78c317..0c448e6 100755 > --- a/tests/qemu-iotests/140 > +++ b/tests/qemu-iotests/140 > @@ -49,8 +49,8 @@ _make_test_img 64k > $QEMU_IO -c 'write -P 42 0 64k' "$TEST_IMG" | _filter_qemu_io > =20 > keep_stderr=3Dy \ > -_launch_qemu -drive if=3Dide,media=3Dcdrom,id=3Ddrv,file=3D"$TEST_IMG"= ,format=3D$IMGFMT \ > - 2> >(_filter_nbd) > +_launch_qemu -drive if=3Dnone,media=3Dcdrom,id=3Ddrv,file=3D"$TEST_IMG= ",format=3D$IMGFMT \ > + -device virtio-scsi -device scsi-cd,drive=3Ddrv 2> >(_filter_nbd) Why not just omit the device (and the media=3Dcdrom along with it, keepin= g if=3Dnone)? This will change the reference output because there is no longer any tray to be moved, but this will still test what it's supposed = to. (This may sound hypocritical coming from me, because I wrote this test so I could have just done so in the first place; I guess I just didn't realize that 'eject' works on device-less drives, too.) Max > _send_qemu_cmd $QEMU_HANDLE \ > "{ 'execute': 'qmp_capabilities' }" \ >=20 --BFsfulhFuMcReTVH4sIIs1clcl62eCtr2 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJWu2IyAAoJEDuxQgLoOKytnAIH/RAGUufeoUyBAhicOkO48Ei2 PlTNhdVFXkEAkHQ+aOoIJMiwDK7FXUCaK86O0p729CE+mWXE2ZZQ/4dmYRwYdsle B6viNS5af9o3iNG8XaunfbSLbpEwl8loNIfa+LI842CYYZK7pg5hI8ks9rcNQ6FW TIfVjQRFgvX7S8afUFjo0UxzFmdY56p9wUEJ4qbVg462MYUwhbVVuGiUmJJCU/Ly LQ7wbFgT5FWZfVfs2jx/pSRGW/a4PAQGLOX7oOcRDP0M98Ul01Bo6rvVAt21THmw fUS2NUg2Dne7SwPXR1749acqgiiaKAClRyrZyA0xjbA6ibHNH5bmZNcZAhDqPZI= =13z1 -----END PGP SIGNATURE----- --BFsfulhFuMcReTVH4sIIs1clcl62eCtr2--