From nobody Wed Nov 5 18:26:51 2025 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.zoho.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 1496438047451328.8655534311674; Fri, 2 Jun 2017 14:14:07 -0700 (PDT) Received: from localhost ([::1]:51462 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGttU-0001HP-TP for importer@patchew.org; Fri, 02 Jun 2017 17:14:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51305) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGtrz-0000Dt-Ix for qemu-devel@nongnu.org; Fri, 02 Jun 2017 17:12:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dGtry-0003Eh-Ir for qemu-devel@nongnu.org; Fri, 02 Jun 2017 17:12:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57784) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dGtrv-0003C0-SI; Fri, 02 Jun 2017 17:12:28 -0400 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 E7F9120265; Fri, 2 Jun 2017 21:12:26 +0000 (UTC) Received: from noname.redhat.com (ovpn-117-67.ams2.redhat.com [10.36.117.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6E56C17AD6; Fri, 2 Jun 2017 21:12:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com E7F9120265 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kwolf@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com E7F9120265 From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 2 Jun 2017 23:12:10 +0200 Message-Id: <1496437930-12654-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1496437930-12654-1-git-send-email-kwolf@redhat.com> References: <1496437930-12654-1-git-send-email-kwolf@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.29]); Fri, 02 Jun 2017 21:12:27 +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/2] qemu-iotests: Test automatic commit job cancel on hot unplug 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: kwolf@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.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" Signed-off-by: Kevin Wolf --- tests/qemu-iotests/040 | 35 +++++++++++++++++++++++++++++++++-- tests/qemu-iotests/040.out | 4 ++-- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040 index 5bdaf3d..9d381d9 100755 --- a/tests/qemu-iotests/040 +++ b/tests/qemu-iotests/040 @@ -70,7 +70,9 @@ class ImageCommitTestCase(iotests.QMPTestCase): self.wait_for_complete() =20 class TestSingleDrive(ImageCommitTestCase): - image_len =3D 1 * 1024 * 1024 + # Need some space after the copied data so that throttling is effectiv= e in + # tests that use it rather than just completing the job immediately + image_len =3D 2 * 1024 * 1024 test_len =3D 1 * 1024 * 256 =20 def setUp(self): @@ -79,7 +81,9 @@ class TestSingleDrive(ImageCommitTestCase): qemu_img('create', '-f', iotests.imgfmt, '-o', 'backing_file=3D%s'= % mid_img, test_img) 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) + self.vm =3D iotests.VM().add_drive(test_img, interface=3D"none") + self.vm.add_device("virtio-scsi-pci") + self.vm.add_device("scsi-hd,id=3Dscsi0,drive=3Ddrive0") self.vm.launch() =20 def tearDown(self): @@ -131,6 +135,33 @@ class TestSingleDrive(ImageCommitTestCase): self.assert_qmp(result, 'error/class', 'GenericError') self.assert_qmp(result, 'error/desc', 'Base \'%s\' not found' % mi= d_img) =20 + # When the job is running on a BB that is automatically deleted on hot + # unplug, the job is cancelled when the device disappears + def test_hot_unplug(self): + if self.image_len =3D=3D 0: + return + + self.assert_no_active_block_jobs() + result =3D self.vm.qmp('block-commit', device=3D'drive0', top=3Dmi= d_img, + base=3Dbacking_img, speed=3D(self.image_len /= 4)) + self.assert_qmp(result, 'return', {}) + result =3D self.vm.qmp('device_del', id=3D'scsi0') + self.assert_qmp(result, 'return', {}) + + cancelled =3D False + deleted =3D False + while not cancelled or not deleted: + for event in self.vm.get_qmp_events(wait=3DTrue): + if event['event'] =3D=3D 'DEVICE_DELETED': + self.assert_qmp(event, 'data/device', 'scsi0') + deleted =3D True + elif event['event'] =3D=3D 'BLOCK_JOB_CANCELLED': + self.assert_qmp(event, 'data/device', 'drive0') + cancelled =3D True + else: + self.fail("Unexpected event %s" % (event['event'])) + + self.assert_no_active_block_jobs() =20 class TestRelativePaths(ImageCommitTestCase): image_len =3D 1 * 1024 * 1024 diff --git a/tests/qemu-iotests/040.out b/tests/qemu-iotests/040.out index 4fd1c2d..6d9bee1 100644 --- a/tests/qemu-iotests/040.out +++ b/tests/qemu-iotests/040.out @@ -1,5 +1,5 @@ -......................... +........................... ---------------------------------------------------------------------- -Ran 25 tests +Ran 27 tests =20 OK --=20 1.8.3.1