From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32941) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwqkY-0001Zd-Vt for qemu-devel@nongnu.org; Tue, 26 Sep 2017 10:22:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dwqkR-0005O3-A8 for qemu-devel@nongnu.org; Tue, 26 Sep 2017 10:22:14 -0400 From: Kevin Wolf Date: Tue, 26 Sep 2017 16:21:16 +0200 Message-Id: <20170926142133.2498-8-kwolf@redhat.com> In-Reply-To: <20170926142133.2498-1-kwolf@redhat.com> References: <20170926142133.2498-1-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 07/24] iotests: use virtio aliases for 067 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org From: Cornelia Huck 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 Reviewed-by: QingFeng Hao Reviewed-by: David Hildenbrand Reviewed-by: Thomas Huth Signed-off-by: Kevin Wolf --- tests/qemu-iotests/067 | 2 +- tests/qemu-iotests/067.out | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067 index 5d4ca4bc61..ee9595f0da 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 <