{"id":810197,"url":"http://patchwork.ozlabs.org/api/patches/810197/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170905151614.31303-4-cohuck@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/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":"<20170905151614.31303-4-cohuck@redhat.com>","list_archive_url":null,"date":"2017-09-05T15:16:14","name":"[3/3] iotests: use -ccw on s390x for 067","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"8321cd2ee8f309c739f8a599c4cec08ca18e9529","submitter":{"id":71914,"url":"http://patchwork.ozlabs.org/api/people/71914/?format=json","name":"Cornelia Huck","email":"cohuck@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170905151614.31303-4-cohuck@redhat.com/mbox/","series":[{"id":1596,"url":"http://patchwork.ozlabs.org/api/series/1596/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1596","date":"2017-09-05T15:16:11","name":"iotests: cure s390x failures by switching to ccw","version":1,"mbox":"http://patchwork.ozlabs.org/series/1596/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/810197/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/810197/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-mx08.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx08.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 3xmr294vfXz9t2m\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed,  6 Sep 2017 01:18:09 +1000 (AEST)","from localhost ([::1]:59597 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 1dpFc7-0000ME-Np\n\tfor incoming@patchwork.ozlabs.org; Tue, 05 Sep 2017 11:18:07 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:42999)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <cohuck@redhat.com>) id 1dpFap-0008GD-1g\n\tfor qemu-devel@nongnu.org; Tue, 05 Sep 2017 11:16:52 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <cohuck@redhat.com>) id 1dpFae-0002rU-Uz\n\tfor qemu-devel@nongnu.org; Tue, 05 Sep 2017 11:16:47 -0400","from mx1.redhat.com ([209.132.183.28]:45478)\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 1dpFaT-0002kX-NA; Tue, 05 Sep 2017 11:16:25 -0400","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\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 B5465C004767;\n\tTue,  5 Sep 2017 15:16:24 +0000 (UTC)","from localhost (dhcp-192-215.str.redhat.com [10.33.192.215])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 105E2679EE;\n\tTue,  5 Sep 2017 15:16:23 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com B5465C004767","From":"Cornelia Huck <cohuck@redhat.com>","To":"kwolf@redhat.com,\n\tmreitz@redhat.com","Date":"Tue,  5 Sep 2017 17:16:14 +0200","Message-Id":"<20170905151614.31303-4-cohuck@redhat.com>","In-Reply-To":"<20170905151614.31303-1-cohuck@redhat.com>","References":"<20170905151614.31303-1-cohuck@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.16","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.32]);\n\tTue, 05 Sep 2017 15:16:24 +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 3/3] iotests: use -ccw on s390x for 067","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\nProvide an output file for s390x.\n\nSigned-off-by: Cornelia Huck <cohuck@redhat.com>\n---\n tests/qemu-iotests/067                     |  11 +-\n tests/qemu-iotests/067.s390-ccw-virtio.out | 458 +++++++++++++++++++++++++++++\n 2 files changed, 468 insertions(+), 1 deletion(-)\n create mode 100644 tests/qemu-iotests/067.s390-ccw-virtio.out","diff":"diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067\nindex 5d4ca4bc61..c5db04fb50 100755\n--- a/tests/qemu-iotests/067\n+++ b/tests/qemu-iotests/067\n@@ -37,6 +37,15 @@ _supported_os Linux\n # Because anything other than 16 would change the output of query-block\n _unsupported_imgopts 'refcount_bits=\\([^1]\\|.\\([^6]\\|$\\)\\)'\n \n+case \"$QEMU_DEFAULT_MACHINE\" in\n+  s390-ccw-virtio)\n+      hba=virtio-scsi-ccw\n+      ;;\n+  *)\n+      hba=virtio-scsi-pci\n+      ;;\n+esac\n+\n function do_run_qemu()\n {\n     echo Testing: \"$@\"\n@@ -141,7 +150,7 @@ echo\n echo === Empty drive with -device and device_del ===\n echo\n \n-run_qemu -device virtio-scsi-pci -device scsi-cd,id=cd0 <<EOF\n+run_qemu -device $hba -device scsi-cd,id=cd0 <<EOF\n { \"execute\": \"qmp_capabilities\" }\n { \"execute\": \"query-block\" }\n { \"execute\": \"device_del\", \"arguments\": { \"id\": \"cd0\" } }\ndiff --git a/tests/qemu-iotests/067.s390-ccw-virtio.out b/tests/qemu-iotests/067.s390-ccw-virtio.out\nnew file mode 100644\nindex 0000000000..55315c6efd\n--- /dev/null\n+++ b/tests/qemu-iotests/067.s390-ccw-virtio.out\n@@ -0,0 +1,458 @@\n+QA output created by 067\n+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728\n+\n+=== -drive/-device and device_del ===\n+\n+Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk -device virtio-blk,drive=disk,id=virtio0\n+{\n+    QMP_VERSION\n+}\n+{\n+    \"return\": {\n+    }\n+}\n+{\n+    \"return\": [\n+        {\n+            \"io-status\": \"ok\",\n+            \"device\": \"disk\",\n+            \"locked\": false,\n+            \"removable\": false,\n+            \"inserted\": {\n+                \"iops_rd\": 0,\n+                \"detect_zeroes\": \"off\",\n+                \"image\": {\n+                    \"virtual-size\": 134217728,\n+                    \"filename\": \"TEST_DIR/t.qcow2\",\n+                    \"cluster-size\": 65536,\n+                    \"format\": \"qcow2\",\n+                    \"actual-size\": SIZE,\n+                    \"format-specific\": {\n+                        \"type\": \"qcow2\",\n+                        \"data\": {\n+                            \"compat\": \"1.1\",\n+                            \"lazy-refcounts\": false,\n+                            \"refcount-bits\": 16,\n+                            \"corrupt\": false\n+                        }\n+                    },\n+                    \"dirty-flag\": false\n+                },\n+                \"iops_wr\": 0,\n+                \"ro\": false,\n+                \"node-name\": \"NODE_NAME\",\n+                \"backing_file_depth\": 0,\n+                \"drv\": \"qcow2\",\n+                \"iops\": 0,\n+                \"bps_wr\": 0,\n+                \"write_threshold\": 0,\n+                \"encrypted\": false,\n+                \"bps\": 0,\n+                \"bps_rd\": 0,\n+                \"cache\": {\n+                    \"no-flush\": false,\n+                    \"direct\": false,\n+                    \"writeback\": true\n+                },\n+                \"file\": \"TEST_DIR/t.qcow2\",\n+                \"encryption_key_missing\": false\n+            },\n+            \"qdev\": \"/machine/peripheral/virtio0/virtio-backend\",\n+            \"type\": \"unknown\"\n+        }\n+    ]\n+}\n+{\n+    \"return\": {\n+    }\n+}\n+{\n+    \"return\": {\n+    }\n+}\n+{\n+    \"return\": [\n+    ]\n+}\n+{\n+    \"return\": {\n+    }\n+}\n+\n+=== -drive/device_add and device_del ===\n+\n+Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk\n+{\n+    QMP_VERSION\n+}\n+{\n+    \"return\": {\n+    }\n+}\n+{\n+    \"return\": [\n+        {\n+            \"device\": \"disk\",\n+            \"locked\": false,\n+            \"removable\": true,\n+            \"inserted\": {\n+                \"iops_rd\": 0,\n+                \"detect_zeroes\": \"off\",\n+                \"image\": {\n+                    \"virtual-size\": 134217728,\n+                    \"filename\": \"TEST_DIR/t.qcow2\",\n+                    \"cluster-size\": 65536,\n+                    \"format\": \"qcow2\",\n+                    \"actual-size\": SIZE,\n+                    \"format-specific\": {\n+                        \"type\": \"qcow2\",\n+                        \"data\": {\n+                            \"compat\": \"1.1\",\n+                            \"lazy-refcounts\": false,\n+                            \"refcount-bits\": 16,\n+                            \"corrupt\": false\n+                        }\n+                    },\n+                    \"dirty-flag\": false\n+                },\n+                \"iops_wr\": 0,\n+                \"ro\": false,\n+                \"node-name\": \"NODE_NAME\",\n+                \"backing_file_depth\": 0,\n+                \"drv\": \"qcow2\",\n+                \"iops\": 0,\n+                \"bps_wr\": 0,\n+                \"write_threshold\": 0,\n+                \"encrypted\": false,\n+                \"bps\": 0,\n+                \"bps_rd\": 0,\n+                \"cache\": {\n+                    \"no-flush\": false,\n+                    \"direct\": false,\n+                    \"writeback\": true\n+                },\n+                \"file\": \"TEST_DIR/t.qcow2\",\n+                \"encryption_key_missing\": false\n+            },\n+            \"type\": \"unknown\"\n+        }\n+    ]\n+}\n+{\n+    \"return\": {\n+    }\n+}\n+{\n+    \"return\": {\n+    }\n+}\n+{\n+    \"return\": {\n+    }\n+}\n+{\n+    \"return\": [\n+    ]\n+}\n+{\n+    \"return\": {\n+    }\n+}\n+\n+=== drive_add/device_add and device_del ===\n+\n+Testing:\n+{\n+    QMP_VERSION\n+}\n+{\n+    \"return\": {\n+    }\n+}\n+{\n+    \"return\": \"OK\\r\\n\"\n+}\n+{\n+    \"return\": [\n+        {\n+            \"device\": \"disk\",\n+            \"locked\": false,\n+            \"removable\": true,\n+            \"inserted\": {\n+                \"iops_rd\": 0,\n+                \"detect_zeroes\": \"off\",\n+                \"image\": {\n+                    \"virtual-size\": 134217728,\n+                    \"filename\": \"TEST_DIR/t.qcow2\",\n+                    \"cluster-size\": 65536,\n+                    \"format\": \"qcow2\",\n+                    \"actual-size\": SIZE,\n+                    \"format-specific\": {\n+                        \"type\": \"qcow2\",\n+                        \"data\": {\n+                            \"compat\": \"1.1\",\n+                            \"lazy-refcounts\": false,\n+                            \"refcount-bits\": 16,\n+                            \"corrupt\": false\n+                        }\n+                    },\n+                    \"dirty-flag\": false\n+                },\n+                \"iops_wr\": 0,\n+                \"ro\": false,\n+                \"node-name\": \"NODE_NAME\",\n+                \"backing_file_depth\": 0,\n+                \"drv\": \"qcow2\",\n+                \"iops\": 0,\n+                \"bps_wr\": 0,\n+                \"write_threshold\": 0,\n+                \"encrypted\": false,\n+                \"bps\": 0,\n+                \"bps_rd\": 0,\n+                \"cache\": {\n+                    \"no-flush\": false,\n+                    \"direct\": false,\n+                    \"writeback\": true\n+                },\n+                \"file\": \"TEST_DIR/t.qcow2\",\n+                \"encryption_key_missing\": false\n+            },\n+            \"type\": \"unknown\"\n+        }\n+    ]\n+}\n+{\n+    \"return\": {\n+    }\n+}\n+{\n+    \"return\": {\n+    }\n+}\n+{\n+    \"return\": {\n+    }\n+}\n+{\n+    \"return\": [\n+    ]\n+}\n+{\n+    \"return\": {\n+    }\n+}\n+\n+=== blockdev_add/device_add and device_del ===\n+\n+Testing:\n+{\n+    QMP_VERSION\n+}\n+{\n+    \"return\": {\n+    }\n+}\n+{\n+    \"return\": {\n+    }\n+}\n+{\n+    \"return\": [\n+        {\n+            \"iops_rd\": 0,\n+            \"detect_zeroes\": \"off\",\n+            \"image\": {\n+                \"virtual-size\": 134217728,\n+                \"filename\": \"TEST_DIR/t.qcow2\",\n+                \"cluster-size\": 65536,\n+                \"format\": \"qcow2\",\n+                \"actual-size\": SIZE,\n+                \"format-specific\": {\n+                    \"type\": \"qcow2\",\n+                    \"data\": {\n+                        \"compat\": \"1.1\",\n+                        \"lazy-refcounts\": false,\n+                        \"refcount-bits\": 16,\n+                        \"corrupt\": false\n+                    }\n+                },\n+                \"dirty-flag\": false\n+            },\n+            \"iops_wr\": 0,\n+            \"ro\": false,\n+            \"node-name\": \"disk\",\n+            \"backing_file_depth\": 0,\n+            \"drv\": \"qcow2\",\n+            \"iops\": 0,\n+            \"bps_wr\": 0,\n+            \"write_threshold\": 0,\n+            \"encrypted\": false,\n+            \"bps\": 0,\n+            \"bps_rd\": 0,\n+            \"cache\": {\n+                \"no-flush\": false,\n+                \"direct\": false,\n+                \"writeback\": true\n+            },\n+            \"file\": \"TEST_DIR/t.qcow2\",\n+            \"encryption_key_missing\": false\n+        },\n+        {\n+            \"iops_rd\": 0,\n+            \"detect_zeroes\": \"off\",\n+            \"image\": {\n+                \"virtual-size\": 197120,\n+                \"filename\": \"TEST_DIR/t.qcow2\",\n+                \"format\": \"file\",\n+                \"actual-size\": SIZE,\n+                \"dirty-flag\": false\n+            },\n+            \"iops_wr\": 0,\n+            \"ro\": false,\n+            \"node-name\": \"NODE_NAME\",\n+            \"backing_file_depth\": 0,\n+            \"drv\": \"file\",\n+            \"iops\": 0,\n+            \"bps_wr\": 0,\n+            \"write_threshold\": 0,\n+            \"encrypted\": false,\n+            \"bps\": 0,\n+            \"bps_rd\": 0,\n+            \"cache\": {\n+                \"no-flush\": false,\n+                \"direct\": false,\n+                \"writeback\": true\n+            },\n+            \"file\": \"TEST_DIR/t.qcow2\",\n+            \"encryption_key_missing\": false\n+        }\n+    ]\n+}\n+{\n+    \"return\": {\n+    }\n+}\n+{\n+    \"return\": {\n+    }\n+}\n+{\n+    \"return\": {\n+    }\n+}\n+{\n+    \"return\": [\n+        {\n+            \"iops_rd\": 0,\n+            \"detect_zeroes\": \"off\",\n+            \"image\": {\n+                \"virtual-size\": 134217728,\n+                \"filename\": \"TEST_DIR/t.qcow2\",\n+                \"cluster-size\": 65536,\n+                \"format\": \"qcow2\",\n+                \"actual-size\": SIZE,\n+                \"format-specific\": {\n+                    \"type\": \"qcow2\",\n+                    \"data\": {\n+                        \"compat\": \"1.1\",\n+                        \"lazy-refcounts\": false,\n+                        \"refcount-bits\": 16,\n+                        \"corrupt\": false\n+                    }\n+                },\n+                \"dirty-flag\": false\n+            },\n+            \"iops_wr\": 0,\n+            \"ro\": false,\n+            \"node-name\": \"disk\",\n+            \"backing_file_depth\": 0,\n+            \"drv\": \"qcow2\",\n+            \"iops\": 0,\n+            \"bps_wr\": 0,\n+            \"write_threshold\": 0,\n+            \"encrypted\": false,\n+            \"bps\": 0,\n+            \"bps_rd\": 0,\n+            \"cache\": {\n+                \"no-flush\": false,\n+                \"direct\": false,\n+                \"writeback\": true\n+            },\n+            \"file\": \"TEST_DIR/t.qcow2\",\n+            \"encryption_key_missing\": false\n+        },\n+        {\n+            \"iops_rd\": 0,\n+            \"detect_zeroes\": \"off\",\n+            \"image\": {\n+                \"virtual-size\": 197120,\n+                \"filename\": \"TEST_DIR/t.qcow2\",\n+                \"format\": \"file\",\n+                \"actual-size\": SIZE,\n+                \"dirty-flag\": false\n+            },\n+            \"iops_wr\": 0,\n+            \"ro\": false,\n+            \"node-name\": \"NODE_NAME\",\n+            \"backing_file_depth\": 0,\n+            \"drv\": \"file\",\n+            \"iops\": 0,\n+            \"bps_wr\": 0,\n+            \"write_threshold\": 0,\n+            \"encrypted\": false,\n+            \"bps\": 0,\n+            \"bps_rd\": 0,\n+            \"cache\": {\n+                \"no-flush\": false,\n+                \"direct\": false,\n+                \"writeback\": true\n+            },\n+            \"file\": \"TEST_DIR/t.qcow2\",\n+            \"encryption_key_missing\": false\n+        }\n+    ]\n+}\n+{\n+    \"return\": {\n+    }\n+}\n+\n+=== Empty drive with -device and device_del ===\n+\n+Testing: -device virtio-scsi-ccw -device scsi-cd,id=cd0\n+{\n+    QMP_VERSION\n+}\n+{\n+    \"return\": {\n+    }\n+}\n+{\n+    \"return\": [\n+        {\n+            \"device\": \"\",\n+            \"locked\": false,\n+            \"removable\": true,\n+            \"qdev\": \"cd0\",\n+            \"tray_open\": false,\n+            \"type\": \"unknown\"\n+        }\n+    ]\n+}\n+{\n+    \"return\": {\n+    }\n+}\n+{\n+    \"return\": {\n+    }\n+}\n+{\n+    \"return\": [\n+    ]\n+}\n+{\n+    \"return\": {\n+    }\n+}\n+*** done\n","prefixes":["3/3"]}