From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50947) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ds6Nq-0007Y9-Mk for qemu-devel@nongnu.org; Wed, 13 Sep 2017 08:03:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ds6Nk-00038v-SC for qemu-devel@nongnu.org; Wed, 13 Sep 2017 08:03:10 -0400 References: <20170913091038.2900-1-cohuck@redhat.com> <20170913091038.2900-4-cohuck@redhat.com> From: David Hildenbrand Message-ID: Date: Wed, 13 Sep 2017 14:02:10 +0200 MIME-Version: 1.0 In-Reply-To: <20170913091038.2900-4-cohuck@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 3/3] iotests: use virtio aliases for 067 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cornelia Huck , kwolf@redhat.com, mreitz@redhat.com Cc: qemu-block@nongnu.org, qemu-devel@nongnu.org, borntraeger@de.ibm.com, agraf@suse.de, thuth@redhat.com, haoqf@linux.vnet.ibm.com On 13.09.2017 11:10, Cornelia Huck wrote: > 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. > > Using virtio-scsi will implicitly pick the right device, so just > switch to that for simplicity. > > Signed-off-by: Cornelia Huck > --- > tests/qemu-iotests/067 | 3 ++- > tests/qemu-iotests/067.out | 2 +- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067 > index 5d4ca4bc61..cbb3da286a 100755 > --- a/tests/qemu-iotests/067 > +++ b/tests/qemu-iotests/067 > @@ -141,7 +141,7 @@ echo > echo === Empty drive with -device and device_del === > echo > > -run_qemu -device virtio-scsi-pci -device scsi-cd,id=cd0 < +run_qemu -device virtio-scsi -device scsi-cd,id=cd0 < { "execute": "qmp_capabilities" } > { "execute": "query-block" } > { "execute": "device_del", "arguments": { "id": "cd0" } } > @@ -150,6 +150,7 @@ run_qemu -device virtio-scsi-pci -device scsi-cd,id=cd0 < { "execute": "quit" } > EOF > > + > # success, all done > echo "*** done" > rm -f $seq.full > diff --git a/tests/qemu-iotests/067.out b/tests/qemu-iotests/067.out > index bd70557ddc..58e83c4505 100644 > --- a/tests/qemu-iotests/067.out > +++ b/tests/qemu-iotests/067.out > @@ -419,7 +419,7 @@ Testing: > > === Empty drive with -device and device_del === > > -Testing: -device virtio-scsi-pci -device scsi-cd,id=cd0 > +Testing: -device virtio-scsi -device scsi-cd,id=cd0 > { > QMP_VERSION > } > Certainly not wrong to use the old alias in some tests, as long as we test both variants. Reviewed-by: David Hildenbrand -- Thanks, David