{"id":813248,"url":"http://patchwork.ozlabs.org/api/1.2/patches/813248/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170913091038.2900-3-cohuck@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170913091038.2900-3-cohuck@redhat.com>","list_archive_url":null,"date":"2017-09-13T09:10:37","name":"[v2,2/3] iotests: use -ccw on s390x for 051","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"f32888978885dec7d2bc8ee5dfded283a887882e","submitter":{"id":71914,"url":"http://patchwork.ozlabs.org/api/1.2/people/71914/?format=json","name":"Cornelia Huck","email":"cohuck@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170913091038.2900-3-cohuck@redhat.com/mbox/","series":[{"id":2847,"url":"http://patchwork.ozlabs.org/api/1.2/series/2847/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2847","date":"2017-09-13T09:10:36","name":"iotests: cure s390x failures by switching to ccw/aliases","version":2,"mbox":"http://patchwork.ozlabs.org/series/2847/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/813248/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813248/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=cohuck@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xsbcJ4dkwz9sNr\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 13 Sep 2017 19:15:44 +1000 (AEST)","from localhost ([::1]:41100 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1ds3lm-0003J2-2z\n\tfor incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 05:15:42 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:37591)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <cohuck@redhat.com>) id 1ds3hI-00072A-1c\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 05:11:05 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <cohuck@redhat.com>) id 1ds3hD-0003zX-Op\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 05:11:03 -0400","from mx1.redhat.com ([209.132.183.28]:53984)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <cohuck@redhat.com>)\n\tid 1ds3h6-0003tA-AM; Wed, 13 Sep 2017 05:10:52 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 680CE81E0E;\n\tWed, 13 Sep 2017 09:10:51 +0000 (UTC)","from localhost (dhcp-192-215.str.redhat.com [10.33.192.215])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 9BBA84FA23;\n\tWed, 13 Sep 2017 09:10:48 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 680CE81E0E","From":"Cornelia Huck <cohuck@redhat.com>","To":"kwolf@redhat.com,\n\tmreitz@redhat.com","Date":"Wed, 13 Sep 2017 11:10:37 +0200","Message-Id":"<20170913091038.2900-3-cohuck@redhat.com>","In-Reply-To":"<20170913091038.2900-1-cohuck@redhat.com>","References":"<20170913091038.2900-1-cohuck@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.25]);\n\tWed, 13 Sep 2017 09:10:51 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v2 2/3] iotests: use -ccw on s390x for 051","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"thuth@redhat.com, haoqf@linux.vnet.ibm.com, qemu-block@nongnu.org,\n\tdavid@redhat.com, Cornelia Huck <cohuck@redhat.com>,\n\tqemu-devel@nongnu.org, agraf@suse.de, borntraeger@de.ibm.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"The default cpu model on s390x does not provide zPCI, which is\nnot yet wired up on tcg. Moreover, virtio-ccw is the standard\non s390x, so use the -ccw instead of the -pci versions of virtio\ndevices on s390x.\n\nSigned-off-by: Cornelia Huck <cohuck@redhat.com>\n---\n tests/qemu-iotests/051        | 12 +++++++++++-\n tests/qemu-iotests/051.out    |  2 +-\n tests/qemu-iotests/051.pc.out |  2 +-\n 3 files changed, 13 insertions(+), 3 deletions(-)","diff":"diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051\nindex c8cfc764bc..dba8816c9f 100755\n--- a/tests/qemu-iotests/051\n+++ b/tests/qemu-iotests/051\n@@ -103,7 +103,17 @@ echo\n echo === Device without drive ===\n echo\n \n-run_qemu -device virtio-scsi-pci -device scsi-hd\n+case \"$QEMU_DEFAULT_MACHINE\" in\n+  s390-ccw-virtio)\n+      virtio_scsi=virtio-scsi-ccw\n+      ;;\n+  *)\n+      virtio_scsi=virtio-scsi-pci\n+      ;;\n+esac\n+\n+run_qemu -device $virtio_scsi -device scsi-hd |\n+    sed -e \"s/$virtio_scsi/VIRTIO_SCSI/\"\n \n echo\n echo === Overriding backing file ===\ndiff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out\nindex 4d3b1ff316..e3c6eaba57 100644\n--- a/tests/qemu-iotests/051.out\n+++ b/tests/qemu-iotests/051.out\n@@ -49,7 +49,7 @@ QEMU_PROG: -drive file=TEST_DIR/t.qcow2,driver=qcow2,format=qcow2: Cannot specif\n \n === Device without drive ===\n \n-Testing: -device virtio-scsi-pci -device scsi-hd\n+Testing: -device VIRTIO_SCSI -device scsi-hd\n QEMU X.Y.Z monitor - type 'help' for more information\n (qemu) QEMU_PROG: -device scsi-hd: drive property not set\n \ndiff --git a/tests/qemu-iotests/051.pc.out b/tests/qemu-iotests/051.pc.out\nindex 76d7205460..ae7801b44b 100644\n--- a/tests/qemu-iotests/051.pc.out\n+++ b/tests/qemu-iotests/051.pc.out\n@@ -49,7 +49,7 @@ QEMU_PROG: -drive file=TEST_DIR/t.qcow2,driver=qcow2,format=qcow2: Cannot specif\n \n === Device without drive ===\n \n-Testing: -device virtio-scsi-pci -device scsi-hd\n+Testing: -device VIRTIO_SCSI -device scsi-hd\n QEMU X.Y.Z monitor - type 'help' for more information\n (qemu) QEMU_PROG: -device scsi-hd: drive property not set\n \n","prefixes":["v2","2/3"]}