From nobody Wed Dec 17 05:30:41 2025 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1510656151830194.5334404576463; Tue, 14 Nov 2017 02:42:31 -0800 (PST) Received: from localhost ([::1]:58739 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEYfY-0005Zx-2U for importer@patchew.org; Tue, 14 Nov 2017 05:42:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60676) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEYbX-0002ku-7w for qemu-devel@nongnu.org; Tue, 14 Nov 2017 05:38:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eEYbW-0004b2-1m for qemu-devel@nongnu.org; Tue, 14 Nov 2017 05:38:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54584) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eEYbV-0004a4-OU for qemu-devel@nongnu.org; Tue, 14 Nov 2017 05:38:05 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B7E082C7D2; Tue, 14 Nov 2017 10:38:04 +0000 (UTC) Received: from localhost (unknown [10.36.118.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id CCD768B164; Tue, 14 Nov 2017 10:38:02 +0000 (UTC) From: Stefan Hajnoczi To: Date: Tue, 14 Nov 2017 10:37:21 +0000 Message-Id: <20171114103721.13869-6-stefanha@redhat.com> In-Reply-To: <20171114103721.13869-1-stefanha@redhat.com> References: <20171114103721.13869-1-stefanha@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 (mx1.redhat.com [10.5.110.38]); Tue, 14 Nov 2017 10:38:04 +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] [PULL for-2.11-rc2 5/5] qemu-iotests: Test I/O limits with removable media 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: Peter Maydell , Alberto Garcia , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Alberto Garcia This test hotplugs a CD drive to a VM and checks that I/O limits can be set only when the drive has media inserted and that they are kept when the media is replaced. This also tests the removal of a device with valid I/O limits set but no media inserted. This involves deleting and disabling the limits of a BlockBackend without BlockDriverState, a scenario that has been crashing until the fixes from the last couple of patches. [Python PEP8 fixup: "Don't use spaces are the =3D sign when used to indicate a keyword argument or a default parameter value" --Stefan] Signed-off-by: Alberto Garcia Reviewed-by: Max Reitz Message-id: 071eb397118ed207c5a7f01d58766e415ee18d6a.1510339534.git.berto@i= galia.com Signed-off-by: Stefan Hajnoczi --- tests/qemu-iotests/093 | 62 ++++++++++++++++++++++++++++++++++++++++++= ++++ tests/qemu-iotests/093.out | 4 +-- 2 files changed, 64 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/093 b/tests/qemu-iotests/093 index ef3997206b..5c36a5fb4d 100755 --- a/tests/qemu-iotests/093 +++ b/tests/qemu-iotests/093 @@ -308,6 +308,68 @@ class ThrottleTestGroupNames(iotests.QMPTestCase): groupname =3D "group%d" % i self.verify_name(devname, groupname) =20 +class ThrottleTestRemovableMedia(iotests.QMPTestCase): + def setUp(self): + self.vm =3D iotests.VM() + 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() + + def tearDown(self): + self.vm.shutdown() + + def test_removable_media(self): + # Add a couple of dummy nodes named cd0 and cd1 + result =3D self.vm.qmp("blockdev-add", driver=3D"null-aio", + node_name=3D"cd0") + self.assert_qmp(result, 'return', {}) + result =3D self.vm.qmp("blockdev-add", driver=3D"null-aio", + node_name=3D"cd1") + self.assert_qmp(result, 'return', {}) + + # Attach a CD drive with cd0 inserted + result =3D self.vm.qmp("device_add", driver=3D"scsi-cd", + id=3D"dev0", drive=3D"cd0") + self.assert_qmp(result, 'return', {}) + + # Set I/O limits + args =3D { "id": "dev0", "iops": 100, "iops_rd": 0, "iops_wr": 0, + "bps": 50, "bps_rd": 0, "bps_wr": 0 } + result =3D self.vm.qmp("block_set_io_throttle", conv_keys=3DFalse,= **args) + self.assert_qmp(result, 'return', {}) + + # Check that the I/O limits have been set + result =3D self.vm.qmp("query-block") + self.assert_qmp(result, 'return[0]/inserted/iops', 100) + self.assert_qmp(result, 'return[0]/inserted/bps', 50) + + # Now eject cd0 and insert cd1 + result =3D self.vm.qmp("blockdev-open-tray", id=3D'dev0') + self.assert_qmp(result, 'return', {}) + result =3D self.vm.qmp("x-blockdev-remove-medium", id=3D'dev0') + self.assert_qmp(result, 'return', {}) + result =3D self.vm.qmp("x-blockdev-insert-medium", id=3D'dev0', no= de_name=3D'cd1') + self.assert_qmp(result, 'return', {}) + + # Check that the I/O limits are still the same + result =3D self.vm.qmp("query-block") + self.assert_qmp(result, 'return[0]/inserted/iops', 100) + self.assert_qmp(result, 'return[0]/inserted/bps', 50) + + # Eject cd1 + result =3D self.vm.qmp("x-blockdev-remove-medium", id=3D'dev0') + self.assert_qmp(result, 'return', {}) + + # Check that we can't set limits if the device has no medium + result =3D self.vm.qmp("block_set_io_throttle", conv_keys=3DFalse,= **args) + self.assert_qmp(result, 'error/class', 'GenericError') + + # Remove the CD drive + result =3D self.vm.qmp("device_del", id=3D'dev0') + self.assert_qmp(result, 'return', {}) + =20 if __name__ =3D=3D '__main__': iotests.main(supported_fmts=3D["raw"]) diff --git a/tests/qemu-iotests/093.out b/tests/qemu-iotests/093.out index 2f7d3902f2..594c16f49f 100644 --- a/tests/qemu-iotests/093.out +++ b/tests/qemu-iotests/093.out @@ -1,5 +1,5 @@ -....... +........ ---------------------------------------------------------------------- -Ran 7 tests +Ran 8 tests =20 OK --=20 2.13.6