From nobody Sun Feb 8 05:30:04 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1564606148; cv=none; d=zoho.com; s=zohoarc; b=HKwC+DrbAaUbSEDk9G4dphkTC9Ej+Kiub/wml7+Jh8GXsZNYgvXYJ/cOgUPwF0gLlK7z70y066rOexNPLsvSQZxdYcHV1ExZwmx8KQY9N53hOj+PpQ1vCbyvRuDuejY3UQc3wjAyMVH+htPs+PFru2i/72y7BE8/ZpbGmIhAXPA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564606148; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=FyDVklG0d6VwuUxaxkTSvA0Cyr+nlSmiuBcaGV5YB+o=; b=FrdnLuKuda/PVqwT5yOdOdyMH1a8d9Y+lzdWEKislKM6obm2YHfA7/Y/6VjZe/kXTrNr2MnGlJCQv5pdAoCOVsfaRZ6r2qZG/jALiMsakn55lUb/PknpEhknLPyKE/MCe7cvvVczFeBa6MiXdGinT7u9Rs4KRCuPeEFUjnZG5WI= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564606148647805.1481289100493; Wed, 31 Jul 2019 13:49:08 -0700 (PDT) Received: from localhost ([::1]:44446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsvX1-0003Rs-N8 for importer@patchew.org; Wed, 31 Jul 2019 16:49:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34027) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsvQL-0003gg-1Y for qemu-devel@nongnu.org; Wed, 31 Jul 2019 16:42:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hsvQJ-0005ly-Rc for qemu-devel@nongnu.org; Wed, 31 Jul 2019 16:42:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51186) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hsvQH-0005jf-CX; Wed, 31 Jul 2019 16:42:09 -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 A55BD30860B6; Wed, 31 Jul 2019 20:42:08 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-116-122.ams2.redhat.com [10.36.116.122]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9708B5C207; Wed, 31 Jul 2019 20:42:07 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Wed, 31 Jul 2019 22:42:01 +0200 Message-Id: <20190731204203.10732-2-kwolf@redhat.com> In-Reply-To: <20190731204203.10732-1-kwolf@redhat.com> References: <20190731204203.10732-1-kwolf@redhat.com> MIME-Version: 1.0 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.44]); Wed, 31 Jul 2019 20:42:08 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/3] iotests/118: Test media change for scsi-cd X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" Content-Type: text/plain; charset="utf-8" The test covered only floppy and ide-cd. Add scsi-cd as well. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz --- tests/qemu-iotests/118 | 20 ++++++++++++++++++++ tests/qemu-iotests/118.out | 4 ++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/118 b/tests/qemu-iotests/118 index 499c5f0901..3c20d2d61f 100755 --- a/tests/qemu-iotests/118 +++ b/tests/qemu-iotests/118 @@ -33,6 +33,8 @@ def interface_to_device_name(interface): return 'ide-cd' elif interface =3D=3D 'floppy': return 'floppy' + elif interface =3D=3D 'scsi': + return 'scsi-cd' else: return None =20 @@ -297,6 +299,8 @@ class TestInitiallyFilled(GeneralChangeTestsBaseClass): qemu_img('create', '-f', iotests.imgfmt, new_img, '1440k') self.vm =3D iotests.VM() self.vm.add_drive(old_img, 'media=3D%s' % media, 'none') + if interface =3D=3D 'scsi': + self.vm.add_device('virtio-scsi-pci') self.vm.add_device('%s,drive=3Ddrive0,id=3D%s' % (interface_to_device_name(interface), self.device_name)) @@ -330,6 +334,8 @@ class TestInitiallyEmpty(GeneralChangeTestsBaseClass): def setUp(self, media, interface): qemu_img('create', '-f', iotests.imgfmt, new_img, '1440k') self.vm =3D iotests.VM().add_drive(None, 'media=3D%s' % media, 'no= ne') + if interface =3D=3D 'scsi': + self.vm.add_device('virtio-scsi-pci') self.vm.add_device('%s,drive=3Ddrive0,id=3D%s' % (interface_to_device_name(interface), self.device_name)) @@ -363,6 +369,20 @@ class TestCDInitiallyEmpty(TestInitiallyEmpty): def setUp(self): self.TestInitiallyEmpty.setUp(self, 'cdrom', 'ide') =20 +class TestSCSICDInitiallyFilled(TestInitiallyFilled): + TestInitiallyFilled =3D TestInitiallyFilled + has_real_tray =3D True + + def setUp(self): + self.TestInitiallyFilled.setUp(self, 'cdrom', 'scsi') + +class TestSCSICDInitiallyEmpty(TestInitiallyEmpty): + TestInitiallyEmpty =3D TestInitiallyEmpty + has_real_tray =3D True + + def setUp(self): + self.TestInitiallyEmpty.setUp(self, 'cdrom', 'scsi') + class TestFloppyInitiallyFilled(TestInitiallyFilled): TestInitiallyFilled =3D TestInitiallyFilled has_real_tray =3D False diff --git a/tests/qemu-iotests/118.out b/tests/qemu-iotests/118.out index 4823c113d5..b4ff997a8c 100644 --- a/tests/qemu-iotests/118.out +++ b/tests/qemu-iotests/118.out @@ -1,5 +1,5 @@ -............................................................... +..........................................................................= ............... ---------------------------------------------------------------------- -Ran 63 tests +Ran 89 tests =20 OK --=20 2.20.1