From nobody Mon May 6 12:38:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1504624817819434.1674121477221; Tue, 5 Sep 2017 08:20:17 -0700 (PDT) Received: from localhost ([::1]:59605 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpFeC-0002FR-Nq for importer@patchew.org; Tue, 05 Sep 2017 11:20:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43033) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpFat-0008If-Fv for qemu-devel@nongnu.org; Tue, 05 Sep 2017 11:16:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpFaj-0002ti-OR for qemu-devel@nongnu.org; Tue, 05 Sep 2017 11:16:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40510) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dpFaP-0002gF-LZ; Tue, 05 Sep 2017 11:16:21 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7B49CCA393; Tue, 5 Sep 2017 15:16:20 +0000 (UTC) Received: from localhost (dhcp-192-215.str.redhat.com [10.33.192.215]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5D0A17FB90; Tue, 5 Sep 2017 15:16:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7B49CCA393 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=cohuck@redhat.com From: Cornelia Huck To: kwolf@redhat.com, mreitz@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 (mx1.redhat.com [10.5.110.38]); Tue, 05 Sep 2017 15:16:20 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/3] iotests: use -ccw on s390x for 040, 139, and 182 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, haoqf@linux.vnet.ibm.com, qemu-block@nongnu.org, david@redhat.com, Cornelia Huck , qemu-devel@nongnu.org, agraf@suse.de, borntraeger@de.ibm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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, so use the -ccw instead of the -pci versions of virtio devices on s390x. Signed-off-by: Cornelia Huck Reviewed-by: Kevin Wolf --- tests/qemu-iotests/040 | 6 +++++- tests/qemu-iotests/139 | 12 ++++++++++-- tests/qemu-iotests/182 | 13 +++++++++++-- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040 index 95b7510571..c284d08796 100755 --- a/tests/qemu-iotests/040 +++ b/tests/qemu-iotests/040 @@ -82,7 +82,11 @@ class TestSingleDrive(ImageCommitTestCase): qemu_io('-f', 'raw', '-c', 'write -P 0xab 0 524288', backing_img) qemu_io('-f', iotests.imgfmt, '-c', 'write -P 0xef 524288 524288',= mid_img) self.vm =3D iotests.VM().add_drive(test_img, "node-name=3Dtop,back= ing.node-name=3Dmid,backing.backing.node-name=3Dbase", interface=3D"none") - self.vm.add_device("virtio-scsi-pci") + if iotests.qemu_default_machine =3D=3D 's390-ccw-virtio': + self.vm.add_device("virtio-scsi-ccw") + else: + self.vm.add_device("virtio-scsi-pci") + self.vm.add_device("scsi-hd,id=3Dscsi0,drive=3Ddrive0") self.vm.launch() =20 diff --git a/tests/qemu-iotests/139 b/tests/qemu-iotests/139 index 50cf40fbd5..f8f02808a9 100644 --- a/tests/qemu-iotests/139 +++ b/tests/qemu-iotests/139 @@ -25,13 +25,21 @@ import time =20 base_img =3D os.path.join(iotests.test_dir, 'base.img') new_img =3D os.path.join(iotests.test_dir, 'new.img') +if iotests.qemu_default_machine =3D=3D 's390-ccw-virtio': + default_virtio_blk =3D 'virtio-blk-ccw' +else: + default_virtio_blk =3D 'virtio-blk-pci' =20 class TestBlockdevDel(iotests.QMPTestCase): =20 def setUp(self): iotests.qemu_img('create', '-f', iotests.imgfmt, base_img, '1M') self.vm =3D iotests.VM() - self.vm.add_device("virtio-scsi-pci,id=3Dvirtio-scsi") + if iotests.qemu_default_machine =3D=3D 's390-ccw-virtio': + self.vm.add_device("virtio-scsi-ccw,id=3Dvirtio-scsi") + else: + self.vm.add_device("virtio-scsi-pci,id=3Dvirtio-scsi") + self.vm.launch() =20 def tearDown(self): @@ -87,7 +95,7 @@ class TestBlockdevDel(iotests.QMPTestCase): self.checkBlockDriverState(node, expect_error) =20 # Add a device model - def addDeviceModel(self, device, backend, driver =3D 'virtio-blk-pci'): + def addDeviceModel(self, device, backend, driver =3D default_virtio_bl= k): result =3D self.vm.qmp('device_add', id =3D device, driver =3D driver, drive =3D backend) self.assert_qmp(result, 'return', {}) diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182 index 7ecbb22604..2e078ceed8 100755 --- a/tests/qemu-iotests/182 +++ b/tests/qemu-iotests/182 @@ -45,17 +45,26 @@ _supported_os Linux =20 size=3D32M =20 +case "$QEMU_DEFAULT_MACHINE" in + s390-ccw-virtio) + virtioblk=3Dvirtio-blk-ccw + ;; + *) + virtioblk=3Dvirtio-blk-pci + ;; +esac + _make_test_img $size =20 echo "Starting QEMU" _launch_qemu -drive file=3D$TEST_IMG,if=3Dnone,id=3Ddrive0,file.locking=3D= on \ - -device virtio-blk-pci,drive=3Ddrive0 + -device $virtioblk,drive=3Ddrive0 =20 echo echo "Starting a second QEMU using the same image should fail" echo 'quit' | $QEMU -monitor stdio \ -drive file=3D$TEST_IMG,if=3Dnone,id=3Ddrive0,file.locking=3Don \ - -device virtio-blk-pci,drive=3Ddrive0 2>&1 | _filter_testdir 2>&1 | + -device $virtioblk,drive=3Ddrive0 2>&1 | _filter_testdir 2>&1 | _filter_qemu | sed -e '/falling back to POSIX file/d' \ -e '/locks can be lost unexpectedly/d' --=20 2.13.5 From nobody Mon May 6 12:38:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 150462471707462.157073996175995; Tue, 5 Sep 2017 08:18:37 -0700 (PDT) Received: from localhost ([::1]:59599 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpFcZ-0000qf-T8 for importer@patchew.org; Tue, 05 Sep 2017 11:18:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43016) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpFar-0008Ht-9P for qemu-devel@nongnu.org; Tue, 05 Sep 2017 11:16:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpFah-0002sc-Rr for qemu-devel@nongnu.org; Tue, 05 Sep 2017 11:16:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58832) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dpFaR-0002i3-Fk; Tue, 05 Sep 2017 11:16:23 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 95732171DCA; Tue, 5 Sep 2017 15:16:22 +0000 (UTC) Received: from localhost (dhcp-192-215.str.redhat.com [10.33.192.215]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E7AB27FFC2; Tue, 5 Sep 2017 15:16:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 95732171DCA Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=cohuck@redhat.com From: Cornelia Huck To: kwolf@redhat.com, mreitz@redhat.com Date: Tue, 5 Sep 2017 17:16:13 +0200 Message-Id: <20170905151614.31303-3-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 (mx1.redhat.com [10.5.110.27]); Tue, 05 Sep 2017 15:16:22 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, haoqf@linux.vnet.ibm.com, qemu-block@nongnu.org, david@redhat.com, Cornelia Huck , qemu-devel@nongnu.org, agraf@suse.de, borntraeger@de.ibm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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, so use the -ccw instead of the -pci versions of virtio devices on s390x. Provide an output file for s390x. Signed-off-by: Cornelia Huck --- tests/qemu-iotests/051 | 9 +- tests/qemu-iotests/051.s390-ccw-virtio.out | 434 +++++++++++++++++++++++++= ++++ 2 files changed, 442 insertions(+), 1 deletion(-) create mode 100644 tests/qemu-iotests/051.s390-ccw-virtio.out diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 index c8cfc764bc..f6ad0f4f0b 100755 --- a/tests/qemu-iotests/051 +++ b/tests/qemu-iotests/051 @@ -103,7 +103,14 @@ echo echo =3D=3D=3D Device without drive =3D=3D=3D echo =20 -run_qemu -device virtio-scsi-pci -device scsi-hd +case "$QEMU_DEFAULT_MACHINE" in + s390-ccw-virtio) + run_qemu -device virtio-scsi-ccw -device scsi-hd + ;; + *) + run_qemu -device virtio-scsi-pci -device scsi-hd + ;; +esac =20 echo echo =3D=3D=3D Overriding backing file =3D=3D=3D diff --git a/tests/qemu-iotests/051.s390-ccw-virtio.out b/tests/qemu-iotest= s/051.s390-ccw-virtio.out new file mode 100644 index 0000000000..7555f0b73e --- /dev/null +++ b/tests/qemu-iotests/051.s390-ccw-virtio.out @@ -0,0 +1,434 @@ +QA output created by 051 +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 backing_file= =3DTEST_DIR/t.IMGFMT.base + +=3D=3D=3D Unknown option =3D=3D=3D + +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,unknown_opt=3D,if= =3Dnone,id=3Ddrive0 +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,unknown_opt=3D,if= =3Dnone,id=3Ddrive0: Block format 'qcow2' does not support the option 'unkn= own_opt' + +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,unknown_opt=3Don,if= =3Dnone,id=3Ddrive0 +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,unknown_opt=3Don,= if=3Dnone,id=3Ddrive0: Block format 'qcow2' does not support the option 'un= known_opt' + +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,unknown_opt=3D1234,= if=3Dnone,id=3Ddrive0 +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,unknown_opt=3D123= 4,if=3Dnone,id=3Ddrive0: Block format 'qcow2' does not support the option '= unknown_opt' + +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,unknown_opt=3Dfoo,i= f=3Dnone,id=3Ddrive0 +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,unknown_opt=3Dfoo= ,if=3Dnone,id=3Ddrive0: Block format 'qcow2' does not support the option 'u= nknown_opt' + + +=3D=3D=3D Unknown protocol option =3D=3D=3D + +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,file.unknown_opt=3D +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,file.unknown_opt= =3D: Block protocol 'file' doesn't support the option 'unknown_opt' + +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,file.unknown_opt=3D= on +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,file.unknown_opt= =3Don: Block protocol 'file' doesn't support the option 'unknown_opt' + +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,file.unknown_opt=3D= 1234 +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,file.unknown_opt= =3D1234: Block protocol 'file' doesn't support the option 'unknown_opt' + +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,file.unknown_opt=3D= foo +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,file.unknown_opt= =3Dfoo: Block protocol 'file' doesn't support the option 'unknown_opt' + + +=3D=3D=3D Invalid format =3D=3D=3D + +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dfoo +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dfoo: Unknown driver 'fo= o' + +Testing: -drive file=3DTEST_DIR/t.qcow2,driver=3Dfoo +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,driver=3Dfoo: Unknown driver 'fo= o' + +Testing: -drive file=3DTEST_DIR/t.qcow2,driver=3Draw,format=3Dqcow2 +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,driver=3Draw,format=3Dqcow2: Can= not specify both 'driver' and 'format' + +Testing: -drive file=3DTEST_DIR/t.qcow2,driver=3Dqcow2,format=3Dqcow2 +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,driver=3Dqcow2,format=3Dqcow2: C= annot specify both 'driver' and 'format' + + +=3D=3D=3D Device without drive =3D=3D=3D + +Testing: -device virtio-scsi-ccw -device scsi-hd +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) QEMU_PROG: -device scsi-hd: drive property not set + + +=3D=3D=3D Overriding backing file =3D=3D=3D + +Testing: -drive file=3DTEST_DIR/t.qcow2,driver=3Dqcow2,backing.file.filena= me=3DTEST_DIR/t.qcow2.orig,if=3Dnone,id=3Ddrive0 -nodefaults +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) info block +drive0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) + Removable device: not locked, tray closed + Cache mode: writeback + Backing file: TEST_DIR/t.qcow2.orig (chain depth: 1) +(qemu) quit + +Testing: -drive file=3DTEST_DIR/t.qcow2,driver=3Draw,backing.file.filename= =3DTEST_DIR/t.qcow2.orig +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,driver=3Draw,backing.file.filena= me=3DTEST_DIR/t.qcow2.orig: Driver doesn't support backing files + +Testing: -drive file=3DTEST_DIR/t.qcow2,file.backing.driver=3Dfile,file.ba= cking.filename=3DTEST_DIR/t.qcow2.orig +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,file.backing.driver=3Dfile,file.= backing.filename=3DTEST_DIR/t.qcow2.orig: Driver doesn't support backing fi= les + +Testing: -drive file=3DTEST_DIR/t.qcow2,file.backing.driver=3Dqcow2,file.b= acking.file.filename=3DTEST_DIR/t.qcow2.orig +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,file.backing.driver=3Dqcow2,file= .backing.file.filename=3DTEST_DIR/t.qcow2.orig: Driver doesn't support back= ing files + + +=3D=3D=3D Enable and disable lazy refcounting on the command line, plus so= me invalid values =3D=3D=3D + +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3Don +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) quit + +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3Doff +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) quit + +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D= : Parameter 'lazy-refcounts' expects 'on' or 'off' + +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D42 +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D= 42: Parameter 'lazy-refcounts' expects 'on' or 'off' + +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3Dfoo +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D= foo: Parameter 'lazy-refcounts' expects 'on' or 'off' + + +=3D=3D=3D With version 2 images enabling lazy refcounts must fail =3D=3D= =3D + +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3Don +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3D= on: Lazy refcounts require a qcow2 image with at least qemu 1.1 compatibili= ty level + +Testing: -drive file=3DTEST_DIR/t.qcow2,format=3Dqcow2,lazy-refcounts=3Doff +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) quit + + +=3D=3D=3D No medium =3D=3D=3D + +Testing: -drive if=3Dvirtio +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) QEMU_PROG: -drive if=3Dvirtio: Device needs media, but drive is emp= ty + + +=3D=3D=3D Read-only =3D=3D=3D + +Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dvirtio,readonly=3Don +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) quit + + +=3D=3D=3D Cache modes =3D=3D=3D + +Testing: -drive driver=3Dnull-co,cache=3Dnone +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) quit + +Testing: -drive driver=3Dnull-co,cache=3Ddirectsync +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) quit + +Testing: -drive driver=3Dnull-co,cache=3Dwriteback +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) quit + +Testing: -drive driver=3Dnull-co,cache=3Dwritethrough +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) quit + +Testing: -drive driver=3Dnull-co,cache=3Dunsafe +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) quit + +Testing: -drive driver=3Dnull-co,cache=3Dinvalid_value +QEMU_PROG: -drive driver=3Dnull-co,cache=3Dinvalid_value: invalid cache op= tion + +Testing: -drive file=3DTEST_DIR/t.qcow2,cache=3Dwriteback,backing.file.fil= ename=3DTEST_DIR/t.qcow2.base,backing.cache.no-flush=3Don,backing.node-name= =3Dbacking,backing.file.node-name=3Dbacking-file,file.node-name=3Dfile,if= =3Dnone,id=3Ddrive0 -nodefaults +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) info block +drive0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) + Removable device: not locked, tray closed + Cache mode: writeback + Backing file: TEST_DIR/t.qcow2.base (chain depth: 1) +(qemu) info block file + +file: TEST_DIR/t.qcow2 (file) + Cache mode: writeback +(qemu) info block backing +backing: TEST_DIR/t.qcow2.base (qcow2, read-only) + Cache mode: writeback, ignore flushes +(qemu) info block backing-file + +backing-file: TEST_DIR/t.qcow2.base (file, read-only) + Cache mode: writeback, ignore flushes +(qemu) quit + +Testing: -drive file=3DTEST_DIR/t.qcow2,cache=3Dwritethrough,backing.file.= filename=3DTEST_DIR/t.qcow2.base,backing.cache.no-flush=3Don,backing.node-n= ame=3Dbacking,backing.file.node-name=3Dbacking-file,file.node-name=3Dfile,i= f=3Dnone,id=3Ddrive0 -nodefaults +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) info block +drive0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) + Removable device: not locked, tray closed + Cache mode: writethrough + Backing file: TEST_DIR/t.qcow2.base (chain depth: 1) +(qemu) info block file + +file: TEST_DIR/t.qcow2 (file) + Cache mode: writeback +(qemu) info block backing +backing: TEST_DIR/t.qcow2.base (qcow2, read-only) + Cache mode: writeback, ignore flushes +(qemu) info block backing-file + +backing-file: TEST_DIR/t.qcow2.base (file, read-only) + Cache mode: writeback, ignore flushes +(qemu) quit + +Testing: -drive file=3DTEST_DIR/t.qcow2,cache=3Dunsafe,backing.file.filena= me=3DTEST_DIR/t.qcow2.base,backing.cache.no-flush=3Don,backing.node-name=3D= backing,backing.file.node-name=3Dbacking-file,file.node-name=3Dfile,if=3Dno= ne,id=3Ddrive0 -nodefaults +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) info block +drive0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) + Removable device: not locked, tray closed + Cache mode: writeback, ignore flushes + Backing file: TEST_DIR/t.qcow2.base (chain depth: 1) +(qemu) info block file + +file: TEST_DIR/t.qcow2 (file) + Cache mode: writeback, ignore flushes +(qemu) info block backing +backing: TEST_DIR/t.qcow2.base (qcow2, read-only) + Cache mode: writeback, ignore flushes +(qemu) info block backing-file + +backing-file: TEST_DIR/t.qcow2.base (file, read-only) + Cache mode: writeback, ignore flushes +(qemu) quit + +Testing: -drive file=3DTEST_DIR/t.qcow2,cache=3Dinvalid_value,backing.file= .filename=3DTEST_DIR/t.qcow2.base,backing.cache.no-flush=3Don,backing.node-= name=3Dbacking,backing.file.node-name=3Dbacking-file,file.node-name=3Dfile,= if=3Dnone,id=3Ddrive0 -nodefaults +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,cache=3Dinvalid_value,backing.fi= le.filename=3DTEST_DIR/t.qcow2.base,backing.cache.no-flush=3Don,backing.nod= e-name=3Dbacking,backing.file.node-name=3Dbacking-file,file.node-name=3Dfil= e,if=3Dnone,id=3Ddrive0: invalid cache option + + +=3D=3D=3D Specifying the protocol layer =3D=3D=3D + +Testing: -drive file=3DTEST_DIR/t.qcow2,file.driver=3Dfile +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) quit + + +=3D=3D=3D Leaving out required options =3D=3D=3D + +Testing: -drive driver=3Dfile +QEMU_PROG: -drive driver=3Dfile: The 'file' block driver requires a file n= ame + +Testing: -drive driver=3Dfile,filename=3D +QEMU_PROG: -drive driver=3Dfile,filename=3D: The 'file' block driver requi= res a file name + +Testing: -drive driver=3Dnbd +QEMU_PROG: -drive driver=3Dnbd: NBD server address missing + +Testing: -drive driver=3Draw +QEMU_PROG: -drive driver=3Draw: A block device must be specified for "file" + +Testing: -drive file.driver=3Dfile +QEMU_PROG: -drive file.driver=3Dfile: The 'file' block driver requires a f= ile name + +Testing: -drive file.driver=3Dnbd +QEMU_PROG: -drive file.driver=3Dnbd: NBD server address missing + +Testing: -drive file.driver=3Draw +QEMU_PROG: -drive file.driver=3Draw: A block device must be specified for = "file" + +Testing: -drive foo=3Dbar +QEMU_PROG: -drive foo=3Dbar: Must specify either driver or file + + +=3D=3D=3D Specifying both an option and its legacy alias =3D=3D=3D + +Testing: -drive file=3DTEST_DIR/t.qcow2,iops=3D1234,throttling.iops-total= =3D5678 +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,iops=3D1234,throttling.iops-tota= l=3D5678: 'throttling.iops-total' and its alias 'iops' can't be used at the= same time + +Testing: -drive file=3DTEST_DIR/t.qcow2,iops_rd=3D1234,throttling.iops-rea= d=3D5678 +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,iops_rd=3D1234,throttling.iops-r= ead=3D5678: 'throttling.iops-read' and its alias 'iops_rd' can't be used at= the same time + +Testing: -drive file=3DTEST_DIR/t.qcow2,iops_wr=3D1234,throttling.iops-wri= te=3D5678 +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,iops_wr=3D1234,throttling.iops-w= rite=3D5678: 'throttling.iops-write' and its alias 'iops_wr' can't be used = at the same time + +Testing: -drive file=3DTEST_DIR/t.qcow2,bps=3D1234,throttling.bps-total=3D= 5678 +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,bps=3D1234,throttling.bps-total= =3D5678: 'throttling.bps-total' and its alias 'bps' can't be used at the sa= me time + +Testing: -drive file=3DTEST_DIR/t.qcow2,bps_rd=3D1234,throttling.bps-read= =3D5678 +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,bps_rd=3D1234,throttling.bps-rea= d=3D5678: 'throttling.bps-read' and its alias 'bps_rd' can't be used at the= same time + +Testing: -drive file=3DTEST_DIR/t.qcow2,bps_wr=3D1234,throttling.bps-write= =3D5678 +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,bps_wr=3D1234,throttling.bps-wri= te=3D5678: 'throttling.bps-write' and its alias 'bps_wr' can't be used at t= he same time + +Testing: -drive file=3DTEST_DIR/t.qcow2,iops_max=3D1234,throttling.iops-to= tal-max=3D5678 +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,iops_max=3D1234,throttling.iops-= total-max=3D5678: 'throttling.iops-total-max' and its alias 'iops_max' can'= t be used at the same time + +Testing: -drive file=3DTEST_DIR/t.qcow2,iops_rd_max=3D1234,throttling.iops= -read-max=3D5678 +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,iops_rd_max=3D1234,throttling.io= ps-read-max=3D5678: 'throttling.iops-read-max' and its alias 'iops_rd_max' = can't be used at the same time + +Testing: -drive file=3DTEST_DIR/t.qcow2,iops_wr_max=3D1234,throttling.iops= -write-max=3D5678 +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,iops_wr_max=3D1234,throttling.io= ps-write-max=3D5678: 'throttling.iops-write-max' and its alias 'iops_wr_max= ' can't be used at the same time + +Testing: -drive file=3DTEST_DIR/t.qcow2,bps_max=3D1234,throttling.bps-tota= l-max=3D5678 +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,bps_max=3D1234,throttling.bps-to= tal-max=3D5678: 'throttling.bps-total-max' and its alias 'bps_max' can't be= used at the same time + +Testing: -drive file=3DTEST_DIR/t.qcow2,bps_rd_max=3D1234,throttling.bps-r= ead-max=3D5678 +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,bps_rd_max=3D1234,throttling.bps= -read-max=3D5678: 'throttling.bps-read-max' and its alias 'bps_rd_max' can'= t be used at the same time + +Testing: -drive file=3DTEST_DIR/t.qcow2,bps_wr_max=3D1234,throttling.bps-w= rite-max=3D5678 +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,bps_wr_max=3D1234,throttling.bps= -write-max=3D5678: 'throttling.bps-write-max' and its alias 'bps_wr_max' ca= n't be used at the same time + +Testing: -drive file=3DTEST_DIR/t.qcow2,iops_size=3D1234,throttling.iops-s= ize=3D5678 +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,iops_size=3D1234,throttling.iops= -size=3D5678: 'throttling.iops-size' and its alias 'iops_size' can't be use= d at the same time + +Testing: -drive file=3DTEST_DIR/t.qcow2,readonly=3Don,read-only=3Doff +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,readonly=3Don,read-only=3Doff: '= read-only' and its alias 'readonly' can't be used at the same time + + +=3D=3D=3D Catching negative/large throttling values =3D=3D=3D + +Testing: -drive file=3DTEST_DIR/t.qcow2,iops=3D-1 +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,iops=3D-1: bps/iops/max values m= ust be within [0, 1000000000000000] + +Testing: -drive file=3DTEST_DIR/t.qcow2,bps=3D-2 +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,bps=3D-2: bps/iops/max values mu= st be within [0, 1000000000000000] + +Testing: -drive file=3DTEST_DIR/t.qcow2,bps_rd=3D-3 +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,bps_rd=3D-3: bps/iops/max values= must be within [0, 1000000000000000] + +Testing: -drive file=3DTEST_DIR/t.qcow2,bps_rd_max=3D-3 +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,bps_rd_max=3D-3: bps/iops/max va= lues must be within [0, 1000000000000000] + +Testing: -drive file=3DTEST_DIR/t.qcow2,throttling.iops-total=3D-4 +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,throttling.iops-total=3D-4: bps/= iops/max values must be within [0, 1000000000000000] + +Testing: -drive file=3DTEST_DIR/t.qcow2,throttling.bps-total=3D-5 +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,throttling.bps-total=3D-5: bps/i= ops/max values must be within [0, 1000000000000000] + +Testing: -drive file=3DTEST_DIR/t.qcow2,bps=3D0 +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) quit + +Testing: -drive file=3DTEST_DIR/t.qcow2,bps=3D1 +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) quit + +Testing: -drive file=3DTEST_DIR/t.qcow2,bps=3D1000000000000000 +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) quit + +Testing: -drive file=3DTEST_DIR/t.qcow2,bps=3D1000000000000001 +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,bps=3D1000000000000001: bps/iops= /max values must be within [0, 1000000000000000] + +Testing: -drive file=3DTEST_DIR/t.qcow2,bps=3D9999999999999999 +QEMU_PROG: -drive file=3DTEST_DIR/t.qcow2,bps=3D9999999999999999: bps/iops= /max values must be within [0, 1000000000000000] + + +=3D=3D=3D Parsing protocol from file name =3D=3D=3D + +Testing: -hda foo:bar +QEMU_PROG: -hda foo:bar: Unknown protocol 'foo' + +Testing: -drive file=3Dfoo:bar +QEMU_PROG: -drive file=3Dfoo:bar: Unknown protocol 'foo' + +Testing: -drive file.filename=3Dfoo:bar +QEMU_PROG: -drive file.filename=3Dfoo:bar: Could not open 'foo:bar': No su= ch file or directory + +Testing: -hda file:TEST_DIR/t.qcow2 +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) quit + +Testing: -drive file=3Dfile:TEST_DIR/t.qcow2 +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) quit + +Testing: -drive file.filename=3Dfile:TEST_DIR/t.qcow2 +QEMU_PROG: -drive file.filename=3Dfile:TEST_DIR/t.qcow2: Could not open 'f= ile:TEST_DIR/t.qcow2': No such file or directory + + +=3D=3D=3D Snapshot mode =3D=3D=3D + +wrote 4096/4096 bytes at offset 0 +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,id=3Ddrive0 -snapshot +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) qemu-io drive0 "write -P 0x22 0 4k" +wrote 4096/4096 bytes at offset 0 +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +(qemu) quit + +Testing: -drive file=3DTEST_DIR/t.qcow2,snapshot=3Don,if=3Dnone,id=3Ddrive0 +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) qemu-io drive0 "write -P 0x22 0 4k" +wrote 4096/4096 bytes at offset 0 +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +(qemu) quit + +Testing: -drive file.filename=3DTEST_DIR/t.qcow2,driver=3Dqcow2,snapshot= =3Don,if=3Dnone,id=3Ddrive0 +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) qemu-io drive0 "write -P 0x22 0 4k" +wrote 4096/4096 bytes at offset 0 +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +(qemu) quit + +Testing: -drive file.filename=3DTEST_DIR/t.qcow2,driver=3Dqcow2,if=3Dnone,= id=3Ddrive0 -snapshot +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) qemu-io drive0 "write -P 0x22 0 4k" +wrote 4096/4096 bytes at offset 0 +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +(qemu) quit + +Testing: -drive file=3Dfile:TEST_DIR/t.qcow2,if=3Dnone,id=3Ddrive0 -snapsh= ot +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) qemu-io drive0 "write -P 0x22 0 4k" +wrote 4096/4096 bytes at offset 0 +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +(qemu) quit + +Testing: -drive file=3Dfile:TEST_DIR/t.qcow2,snapshot=3Don,if=3Dnone,id=3D= drive0 +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) qemu-io drive0 "write -P 0x22 0 4k" +wrote 4096/4096 bytes at offset 0 +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +(qemu) quit + +Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,id=3Ddrive0 -snapshot +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) qemu-io drive0 "write -P 0x22 0 4k" +wrote 4096/4096 bytes at offset 0 +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +(qemu) quit + +Testing: -drive file=3DTEST_DIR/t.qcow2,snapshot=3Don,if=3Dnone,id=3Ddrive0 +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) qemu-io drive0 "write -P 0x22 0 4k" +wrote 4096/4096 bytes at offset 0 +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +(qemu) quit + +read 4096/4096 bytes at offset 0 +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +Testing: -drive file=3DTEST_DIR/t.qcow2,snapshot=3Doff,if=3Dnone,id=3Ddriv= e0 +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) qemu-io drive0 "write -P 0x22 0 4k" +wrote 4096/4096 bytes at offset 0 +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +(qemu) quit + +read 4096/4096 bytes at offset 0 +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +Testing: -drive file=3DTEST_DIR/t.qcow2,snapshot=3Don,if=3Dnone,id=3Ddrive0 +QEMU X.Y.Z monitor - type 'help' for more information +(qemu) qemu-io drive0 "write -P 0x33 0 4k" +wrote 4096/4096 bytes at offset 0 +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +(qemu) commit drive0 +(qemu) quit + +read 4096/4096 bytes at offset 0 +4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +*** done --=20 2.13.5 From nobody Mon May 6 12:38:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1504624745411390.78101072196864; Tue, 5 Sep 2017 08:19:05 -0700 (PDT) Received: from localhost ([::1]:59600 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpFd2-0001E6-2T for importer@patchew.org; Tue, 05 Sep 2017 11:19:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42999) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpFap-0008GD-1g for qemu-devel@nongnu.org; Tue, 05 Sep 2017 11:16:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpFae-0002rU-Uz for qemu-devel@nongnu.org; Tue, 05 Sep 2017 11:16:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45478) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dpFaT-0002kX-NA; Tue, 05 Sep 2017 11:16:25 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B5465C004767; Tue, 5 Sep 2017 15:16:24 +0000 (UTC) Received: from localhost (dhcp-192-215.str.redhat.com [10.33.192.215]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 105E2679EE; Tue, 5 Sep 2017 15:16:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B5465C004767 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=cohuck@redhat.com From: Cornelia Huck To: kwolf@redhat.com, mreitz@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 (mx1.redhat.com [10.5.110.32]); Tue, 05 Sep 2017 15:16:24 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, haoqf@linux.vnet.ibm.com, qemu-block@nongnu.org, david@redhat.com, Cornelia Huck , qemu-devel@nongnu.org, agraf@suse.de, borntraeger@de.ibm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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, so use the -ccw instead of the -pci versions of virtio devices on s390x. Provide an output file for s390x. Signed-off-by: Cornelia Huck --- tests/qemu-iotests/067 | 11 +- tests/qemu-iotests/067.s390-ccw-virtio.out | 458 +++++++++++++++++++++++++= ++++ 2 files changed, 468 insertions(+), 1 deletion(-) create mode 100644 tests/qemu-iotests/067.s390-ccw-virtio.out diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067 index 5d4ca4bc61..c5db04fb50 100755 --- a/tests/qemu-iotests/067 +++ b/tests/qemu-iotests/067 @@ -37,6 +37,15 @@ _supported_os Linux # Because anything other than 16 would change the output of query-block _unsupported_imgopts 'refcount_bits=3D\([^1]\|.\([^6]\|$\)\)' =20 +case "$QEMU_DEFAULT_MACHINE" in + s390-ccw-virtio) + hba=3Dvirtio-scsi-ccw + ;; + *) + hba=3Dvirtio-scsi-pci + ;; +esac + function do_run_qemu() { echo Testing: "$@" @@ -141,7 +150,7 @@ echo echo =3D=3D=3D Empty drive with -device and device_del =3D=3D=3D echo =20 -run_qemu -device virtio-scsi-pci -device scsi-cd,id=3Dcd0 <