Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/810198/?format=api
{ "id": 810198, "url": "http://patchwork.ozlabs.org/api/patches/810198/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170905151614.31303-2-cohuck@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "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-2-cohuck@redhat.com>", "list_archive_url": null, "date": "2017-09-05T15:16:12", "name": "[1/3] iotests: use -ccw on s390x for 040, 139, and 182", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "cec1e4f834c2a1c0fea6f09c2866533485f205e1", "submitter": { "id": 71914, "url": "http://patchwork.ozlabs.org/api/people/71914/?format=api", "name": "Cornelia Huck", "email": "cohuck@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170905151614.31303-2-cohuck@redhat.com/mbox/", "series": [ { "id": 1596, "url": "http://patchwork.ozlabs.org/api/series/1596/?format=api", "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/810198/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/810198/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-mx09.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com", "ext-mx09.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 3xmr433CFRz9s7c\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 6 Sep 2017 01:19:47 +1000 (AEST)", "from localhost ([::1]:59601 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 1dpFdh-0001by-GR\n\tfor incoming@patchwork.ozlabs.org; Tue, 05 Sep 2017 11:19:45 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:43033)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <cohuck@redhat.com>) id 1dpFat-0008If-Fv\n\tfor qemu-devel@nongnu.org; Tue, 05 Sep 2017 11:16:56 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <cohuck@redhat.com>) id 1dpFaj-0002ti-OR\n\tfor qemu-devel@nongnu.org; Tue, 05 Sep 2017 11:16:51 -0400", "from mx1.redhat.com ([209.132.183.28]:40510)\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 1dpFaP-0002gF-LZ; Tue, 05 Sep 2017 11:16:21 -0400", "from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\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 7B49CCA393;\n\tTue, 5 Sep 2017 15:16:20 +0000 (UTC)", "from localhost (dhcp-192-215.str.redhat.com [10.33.192.215])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 5D0A17FB90;\n\tTue, 5 Sep 2017 15:16:19 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com 7B49CCA393", "From": "Cornelia Huck <cohuck@redhat.com>", "To": "kwolf@redhat.com,\n\tmreitz@redhat.com", "Date": "Tue, 5 Sep 2017 17:16:12 +0200", "Message-Id": "<20170905151614.31303-2-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.13", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.38]);\n\tTue, 05 Sep 2017 15:16:20 +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 1/3] iotests: use -ccw on s390x for 040, 139,\n\tand 182", "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/040 | 6 +++++-\n tests/qemu-iotests/139 | 12 ++++++++++--\n tests/qemu-iotests/182 | 13 +++++++++++--\n 3 files changed, 26 insertions(+), 5 deletions(-)", "diff": "diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040\nindex 95b7510571..c284d08796 100755\n--- a/tests/qemu-iotests/040\n+++ b/tests/qemu-iotests/040\n@@ -82,7 +82,11 @@ class TestSingleDrive(ImageCommitTestCase):\n qemu_io('-f', 'raw', '-c', 'write -P 0xab 0 524288', backing_img)\n qemu_io('-f', iotests.imgfmt, '-c', 'write -P 0xef 524288 524288', mid_img)\n self.vm = iotests.VM().add_drive(test_img, \"node-name=top,backing.node-name=mid,backing.backing.node-name=base\", interface=\"none\")\n- self.vm.add_device(\"virtio-scsi-pci\")\n+ if iotests.qemu_default_machine == 's390-ccw-virtio':\n+ self.vm.add_device(\"virtio-scsi-ccw\")\n+ else:\n+ self.vm.add_device(\"virtio-scsi-pci\")\n+\n self.vm.add_device(\"scsi-hd,id=scsi0,drive=drive0\")\n self.vm.launch()\n \ndiff --git a/tests/qemu-iotests/139 b/tests/qemu-iotests/139\nindex 50cf40fbd5..f8f02808a9 100644\n--- a/tests/qemu-iotests/139\n+++ b/tests/qemu-iotests/139\n@@ -25,13 +25,21 @@ import time\n \n base_img = os.path.join(iotests.test_dir, 'base.img')\n new_img = os.path.join(iotests.test_dir, 'new.img')\n+if iotests.qemu_default_machine == 's390-ccw-virtio':\n+ default_virtio_blk = 'virtio-blk-ccw'\n+else:\n+ default_virtio_blk = 'virtio-blk-pci'\n \n class TestBlockdevDel(iotests.QMPTestCase):\n \n def setUp(self):\n iotests.qemu_img('create', '-f', iotests.imgfmt, base_img, '1M')\n self.vm = iotests.VM()\n- self.vm.add_device(\"virtio-scsi-pci,id=virtio-scsi\")\n+ if iotests.qemu_default_machine == 's390-ccw-virtio':\n+ self.vm.add_device(\"virtio-scsi-ccw,id=virtio-scsi\")\n+ else:\n+ self.vm.add_device(\"virtio-scsi-pci,id=virtio-scsi\")\n+\n self.vm.launch()\n \n def tearDown(self):\n@@ -87,7 +95,7 @@ class TestBlockdevDel(iotests.QMPTestCase):\n self.checkBlockDriverState(node, expect_error)\n \n # Add a device model\n- def addDeviceModel(self, device, backend, driver = 'virtio-blk-pci'):\n+ def addDeviceModel(self, device, backend, driver = default_virtio_blk):\n result = self.vm.qmp('device_add', id = device,\n driver = driver, drive = backend)\n self.assert_qmp(result, 'return', {})\ndiff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182\nindex 7ecbb22604..2e078ceed8 100755\n--- a/tests/qemu-iotests/182\n+++ b/tests/qemu-iotests/182\n@@ -45,17 +45,26 @@ _supported_os Linux\n \n size=32M\n \n+case \"$QEMU_DEFAULT_MACHINE\" in\n+ s390-ccw-virtio)\n+ virtioblk=virtio-blk-ccw\n+ ;;\n+ *)\n+ virtioblk=virtio-blk-pci\n+ ;;\n+esac\n+\n _make_test_img $size\n \n echo \"Starting QEMU\"\n _launch_qemu -drive file=$TEST_IMG,if=none,id=drive0,file.locking=on \\\n- -device virtio-blk-pci,drive=drive0\n+ -device $virtioblk,drive=drive0\n \n echo\n echo \"Starting a second QEMU using the same image should fail\"\n echo 'quit' | $QEMU -monitor stdio \\\n -drive file=$TEST_IMG,if=none,id=drive0,file.locking=on \\\n- -device virtio-blk-pci,drive=drive0 2>&1 | _filter_testdir 2>&1 |\n+ -device $virtioblk,drive=drive0 2>&1 | _filter_testdir 2>&1 |\n _filter_qemu |\n sed -e '/falling back to POSIX file/d' \\\n -e '/locks can be lost unexpectedly/d'\n", "prefixes": [ "1/3" ] }