[{"id":1767817,"web_url":"http://patchwork.ozlabs.org/comment/1767817/","msgid":"<81b39e1a-e444-0cc2-899c-28ed4b054080@redhat.com>","list_archive_url":null,"date":"2017-09-13T11:59:43","subject":"Re: [Qemu-devel] [PATCH v2 1/3] iotests: use -ccw on s390x for 040, \n\t139, and 182","submitter":{"id":70402,"url":"http://patchwork.ozlabs.org/api/people/70402/","name":"David Hildenbrand","email":"david@redhat.com"},"content":"On 13.09.2017 11:10, Cornelia Huck wrote:\n> The default cpu model on s390x does not provide zPCI, which is\n> not yet wired up on tcg. Moreover, virtio-ccw is the standard\n> on s390x, so use the -ccw instead of the -pci versions of virtio\n> devices on s390x.\n> \n> Reviewed-by: Kevin Wolf \n> Signed-off-by: Cornelia Huck \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(-)\n> \n> diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040\n> index 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> \n> diff --git a/tests/qemu-iotests/139 b/tests/qemu-iotests/139\n> index 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\nsimply \"virtio_blk\" ?\n\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', {})\n> diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182\n> index 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\ns/virtioblk/virtio_blk/ ?\n\n(due to \"virtio_scsi\" in next patch)\n\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>","headers":{"Return-Path":"","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=)","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=david@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 3xsgGC0vg3z9sNV\n\tfor ;\n\tWed, 13 Sep 2017 22:00:17 +1000 (AEST)","from localhost ([::1]:41808 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1ds6L1-0005fb-76\n\tfor incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 08:00:15 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:48263)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1ds6Kg-0005dL-JB\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 07:59:55 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1ds6Kf-0004zx-IO\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 07:59:54 -0400","from mx1.redhat.com ([209.132.183.28]:50934)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1ds6KZ-0004nh-VN; Wed, 13 Sep 2017 07:59:48 -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 DA9054E4D4;\n\tWed, 13 Sep 2017 11:59:46 +0000 (UTC)","from [10.36.116.21] (ovpn-116-21.ams2.redhat.com [10.36.116.21])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id CC1366062A;\n\tWed, 13 Sep 2017 11:59:44 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com DA9054E4D4","To":"Cornelia Huck , kwolf@redhat.com, mreitz@redhat.com","References":"<20170913091038.2900-1-cohuck@redhat.com>\n\t<20170913091038.2900-2-cohuck@redhat.com>","From":"David Hildenbrand ","Organization":"Red Hat GmbH","Message-ID":"<81b39e1a-e444-0cc2-899c-28ed4b054080@redhat.com>","Date":"Wed, 13 Sep 2017 13:59:43 +0200","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.3.0","MIME-Version":"1.0","In-Reply-To":"<20170913091038.2900-2-cohuck@redhat.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-US","Content-Transfer-Encoding":"7bit","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\tWed, 13 Sep 2017 11:59:47 +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":"Re: [Qemu-devel] [PATCH v2 1/3] iotests: use -ccw on s390x for 040, \n\t139, and 182","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"thuth@redhat.com, qemu-block@nongnu.org, haoqf@linux.vnet.ibm.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"}}]