From nobody Sun Feb 8 14:52:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615913319; cv=none; d=zohomail.com; s=zohoarc; b=IIuHAeKN0K/7+XMVpV7qHnq8WLJMdGIQs1gzbY3MRZV9uZsYgMW43xc+ZBOhE3KiuyNa9M2qxfrPeP40pwYgfF3TnYQVns9mt7PHBPCxrZKtH5mgBeyUodPPLF0lIvr0Rw21Daka+vLXMjozY73YmAH51ZoOLVvwEzClw+StUuw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615913319; h=Content-Type: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; bh=22zN4wm+flMcbaI+xfGqdlSvoD37ggb7HiTSfi2s9YU=; b=ifyzH6RNEJpIFvJSfyuiJg7xt9Y4CW/am5J2Eeg6YHPGWk+qiI/S0V0AB6/weHN69fskyMemvu0uV8CyZ6aUl1P5jJWl3waiovyDCJgdatYPl9745AFgKL7I5XGsO550tH2QtJhW4lvvXVB5SpENt7ToMSsGDkrDJJD5GiGc2bU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1615913319706120.65428313096845; Tue, 16 Mar 2021 09:48:39 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-497-vF4dgo13Pn-MYR0erqFMOw-1; Tue, 16 Mar 2021 12:48:36 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id BCB7918D6A3B; Tue, 16 Mar 2021 16:48:29 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9121C5D9D3; Tue, 16 Mar 2021 16:48:29 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2D4B557DC2; Tue, 16 Mar 2021 16:48:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12GGmRBm007138 for ; Tue, 16 Mar 2021 12:48:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id C4E755FC1D; Tue, 16 Mar 2021 16:48:27 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-185.ams2.redhat.com [10.36.115.185]) by smtp.corp.redhat.com (Postfix) with ESMTP id CA1CA5C1A1; Tue, 16 Mar 2021 16:48:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615913318; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=22zN4wm+flMcbaI+xfGqdlSvoD37ggb7HiTSfi2s9YU=; b=QtrVwaiXGiPCcaMe6aDguEcnI+u9gXihuoyGFqQNKCQp1tXNWRngHY08uuA79DuSyNTc0S ZMTJgy7b2VmI2l4RzT3j550+e2L6B45PRnhiARzZw1Cu/pKAeT5cR8o/SpqpzPzpkd5msF Rpinp6JXZNPnmhS1LCj4mlAmk92yux4= X-MC-Unique: vF4dgo13Pn-MYR0erqFMOw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 09/13] hw/scsi: remove 'scsi-disk' device Date: Tue, 16 Mar 2021 16:43:51 +0000 Message-Id: <20210316164355.150519-10-berrange@redhat.com> In-Reply-To: <20210316164355.150519-1-berrange@redhat.com> References: <20210316164355.150519-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Fam Zheng , "Michael S. Tsirkin" , libvir-list@redhat.com, Mark Cave-Ayland , Gerd Hoffmann , qemu-block@nongnu.org, Juan Quintela , Wainer dos Santos Moschetta , Marcel Apfelbaum , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Artyom Tarasenko , Laurent Vivier , Thomas Huth , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Greg Kurz , Cleber Rosa , John Snow , David Gibson , Kevin Wolf , Vladimir Sementsov-Ogievskiy , Max Reitz , qemu-ppc@nongnu.org, Paolo Bonzini X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) The 'scsi-hd' and 'scsi-cd' devices provide suitable alternatives. Reviewed-by: Thomas Huth Signed-off-by: Daniel P. Berrang=C3=A9 --- docs/system/deprecated.rst | 9 ----- docs/system/removed-features.rst | 6 ++++ hw/i386/pc.c | 1 - hw/scsi/scsi-disk.c | 62 -------------------------------- scripts/device-crash-test | 1 - tests/qemu-iotests/051 | 2 -- tests/qemu-iotests/051.pc.out | 10 ------ 7 files changed, 6 insertions(+), 85 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 93f0d01ee3..9c8c62da44 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -276,15 +276,6 @@ The ``I7200`` guest CPU relies on the nanoMIPS ISA, wh= ich is deprecated (the ISA has never been upstreamed to a compiler toolchain). Therefore this CPU is also deprecated. =20 -System emulator devices ------------------------ - -``scsi-disk`` (since 4.2) -''''''''''''''''''''''''' - -The 'scsi-disk' device is deprecated. Users should use 'scsi-hd' or -'scsi-cd' as appropriate to get a SCSI hard disk or CD-ROM as needed. - System emulator machines ------------------------ =20 diff --git a/docs/system/removed-features.rst b/docs/system/removed-feature= s.rst index 5707b463cd..8ca51e1f7c 100644 --- a/docs/system/removed-features.rst +++ b/docs/system/removed-features.rst @@ -226,6 +226,12 @@ System emulator devices The 'ide-drive' device has been removed. Users should use 'ide-hd' or 'ide-cd' as appropriate to get an IDE hard disk or CD-ROM as needed. =20 +``scsi-disk`` (removed in 6.0) +'''''''''''''''''''''''''''''' + +The 'scsi-disk' device has been removed. Users should use 'scsi-hd' or +'scsi-cd' as appropriate to get a SCSI hard disk or CD-ROM as needed. + Related binaries ---------------- =20 diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 804913bb7e..35e1770950 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -338,7 +338,6 @@ GlobalProperty pc_compat_1_4[] =3D { PC_CPU_MODEL_IDS("1.4.0") { "scsi-hd", "discard_granularity", "0" }, { "scsi-cd", "discard_granularity", "0" }, - { "scsi-disk", "discard_granularity", "0" }, { "ide-hd", "discard_granularity", "0" }, { "ide-cd", "discard_granularity", "0" }, { "virtio-blk-pci", "discard_granularity", "0" }, diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 2eaea7e637..3580e7ee61 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -2476,28 +2476,6 @@ static void scsi_cd_realize(SCSIDevice *dev, Error *= *errp) aio_context_release(ctx); } =20 -static void scsi_disk_realize(SCSIDevice *dev, Error **errp) -{ - DriveInfo *dinfo; - Error *local_err =3D NULL; - - warn_report("'scsi-disk' is deprecated, " - "please use 'scsi-hd' or 'scsi-cd' instead"); - - if (!dev->conf.blk) { - scsi_realize(dev, &local_err); - assert(local_err); - error_propagate(errp, local_err); - return; - } - - dinfo =3D blk_legacy_dinfo(dev->conf.blk); - if (dinfo && dinfo->media_cd) { - scsi_cd_realize(dev, errp); - } else { - scsi_hd_realize(dev, errp); - } -} =20 static const SCSIReqOps scsi_disk_emulate_reqops =3D { .size =3D sizeof(SCSIDiskReq), @@ -3161,45 +3139,6 @@ static const TypeInfo scsi_block_info =3D { }; #endif =20 -static Property scsi_disk_properties[] =3D { - DEFINE_SCSI_DISK_PROPERTIES(), - DEFINE_PROP_BIT("removable", SCSIDiskState, features, - SCSI_DISK_F_REMOVABLE, false), - DEFINE_PROP_BIT("dpofua", SCSIDiskState, features, - SCSI_DISK_F_DPOFUA, false), - DEFINE_PROP_UINT64("wwn", SCSIDiskState, qdev.wwn, 0), - DEFINE_PROP_UINT64("port_wwn", SCSIDiskState, qdev.port_wwn, 0), - DEFINE_PROP_UINT16("port_index", SCSIDiskState, port_index, 0), - DEFINE_PROP_UINT64("max_unmap_size", SCSIDiskState, max_unmap_size, - DEFAULT_MAX_UNMAP_SIZE), - DEFINE_PROP_UINT64("max_io_size", SCSIDiskState, max_io_size, - DEFAULT_MAX_IO_SIZE), - DEFINE_PROP_INT32("scsi_version", SCSIDiskState, qdev.default_scsi_ver= sion, - 5), - DEFINE_PROP_END_OF_LIST(), -}; - -static void scsi_disk_class_initfn(ObjectClass *klass, void *data) -{ - DeviceClass *dc =3D DEVICE_CLASS(klass); - SCSIDeviceClass *sc =3D SCSI_DEVICE_CLASS(klass); - - sc->realize =3D scsi_disk_realize; - sc->alloc_req =3D scsi_new_request; - sc->unit_attention_reported =3D scsi_disk_unit_attention_reported; - dc->fw_name =3D "disk"; - dc->desc =3D "virtual SCSI disk or CD-ROM (legacy)"; - dc->reset =3D scsi_disk_reset; - device_class_set_props(dc, scsi_disk_properties); - dc->vmsd =3D &vmstate_scsi_disk_state; -} - -static const TypeInfo scsi_disk_info =3D { - .name =3D "scsi-disk", - .parent =3D TYPE_SCSI_DISK_BASE, - .class_init =3D scsi_disk_class_initfn, -}; - static void scsi_disk_register_types(void) { type_register_static(&scsi_disk_base_info); @@ -3208,7 +3147,6 @@ static void scsi_disk_register_types(void) #ifdef __linux__ type_register_static(&scsi_block_info); #endif - type_register_static(&scsi_disk_info); } =20 type_init(scsi_disk_register_types) diff --git a/scripts/device-crash-test b/scripts/device-crash-test index 3981209165..6d809ac711 100755 --- a/scripts/device-crash-test +++ b/scripts/device-crash-test @@ -93,7 +93,6 @@ ERROR_RULE_LIST =3D [ {'device':'pci-bridge-seat', 'expected':True}, # Bridge chassi= s not specified. Each bridge is required to be assigned a unique chassis id= > 0. {'device':'pxb', 'expected':True}, # Bridge chassi= s not specified. Each bridge is required to be assigned a unique chassis id= > 0. {'device':'scsi-block', 'expected':True}, # drive propert= y not set - {'device':'scsi-disk', 'expected':True}, # drive propert= y not set {'device':'scsi-generic', 'expected':True}, # drive propert= y not set {'device':'scsi-hd', 'expected':True}, # drive propert= y not set {'device':'spapr-pci-host-bridge', 'expected':True}, # BUID not spec= ified for PHB diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 index 8b334fe41d..f92161d8ef 100755 --- a/tests/qemu-iotests/051 +++ b/tests/qemu-iotests/051 @@ -186,7 +186,6 @@ case "$QEMU_DEFAULT_MACHINE" in run_qemu -drive if=3Dnone,id=3Ddisk -device ide-cd,drive=3Ddisk run_qemu -drive if=3Dnone,id=3Ddisk -device lsi53c895a -device scs= i-cd,drive=3Ddisk run_qemu -drive if=3Dnone,id=3Ddisk -device ide-hd,drive=3Ddisk - run_qemu -drive if=3Dnone,id=3Ddisk -device lsi53c895a -device scs= i-disk,drive=3Ddisk run_qemu -drive if=3Dnone,id=3Ddisk -device lsi53c895a -device scs= i-hd,drive=3Ddisk ;; *) @@ -238,7 +237,6 @@ case "$QEMU_DEFAULT_MACHINE" in run_qemu -drive file=3D"$TEST_IMG",if=3Dnone,id=3Ddisk,readonly=3D= on -device ide-cd,drive=3Ddisk run_qemu -drive file=3D"$TEST_IMG",if=3Dnone,id=3Ddisk,readonly=3D= on -device lsi53c895a -device scsi-cd,drive=3Ddisk run_qemu -drive file=3D"$TEST_IMG",if=3Dnone,id=3Ddisk,readonly=3D= on -device ide-hd,drive=3Ddisk - run_qemu -drive file=3D"$TEST_IMG",if=3Dnone,id=3Ddisk,readonly=3D= on -device lsi53c895a -device scsi-disk,drive=3Ddisk run_qemu -drive file=3D"$TEST_IMG",if=3Dnone,id=3Ddisk,readonly=3D= on -device lsi53c895a -device scsi-hd,drive=3Ddisk ;; *) diff --git a/tests/qemu-iotests/051.pc.out b/tests/qemu-iotests/051.pc.out index 29c0d698b0..a28e3fc124 100644 --- a/tests/qemu-iotests/051.pc.out +++ b/tests/qemu-iotests/051.pc.out @@ -160,11 +160,6 @@ Testing: -drive if=3Dnone,id=3Ddisk -device ide-hd,dri= ve=3Ddisk QEMU X.Y.Z monitor - type 'help' for more information (qemu) QEMU_PROG: -device ide-hd,drive=3Ddisk: Device needs media, but dri= ve is empty =20 -Testing: -drive if=3Dnone,id=3Ddisk -device lsi53c895a -device scsi-disk,d= rive=3Ddisk -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: -device scsi-disk,drive=3Ddisk: warning: 'scsi-disk' is = deprecated, please use 'scsi-hd' or 'scsi-cd' instead -QEMU_PROG: -device scsi-disk,drive=3Ddisk: Device needs media, but drive i= s empty - Testing: -drive if=3Dnone,id=3Ddisk -device lsi53c895a -device scsi-hd,dri= ve=3Ddisk QEMU X.Y.Z monitor - type 'help' for more information (qemu) QEMU_PROG: -device scsi-hd,drive=3Ddisk: Device needs media, but dr= ive is empty @@ -227,11 +222,6 @@ Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,id= =3Ddisk,readonly=3Don -device ide-hd QEMU X.Y.Z monitor - type 'help' for more information (qemu) QEMU_PROG: -device ide-hd,drive=3Ddisk: Block node is read-only =20 -Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,id=3Ddisk,readonly=3Don = -device lsi53c895a -device scsi-disk,drive=3Ddisk -QEMU X.Y.Z monitor - type 'help' for more information -(qemu) QEMU_PROG: -device scsi-disk,drive=3Ddisk: warning: 'scsi-disk' is = deprecated, please use 'scsi-hd' or 'scsi-cd' instead -quit - Testing: -drive file=3DTEST_DIR/t.qcow2,if=3Dnone,id=3Ddisk,readonly=3Don = -device lsi53c895a -device scsi-hd,drive=3Ddisk QEMU X.Y.Z monitor - type 'help' for more information (qemu) quit --=20 2.30.2