From nobody Tue Nov 18 18:23:23 2025 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=1611592049; cv=none; d=zohomail.com; s=zohoarc; b=Dnd9aQNDhsi6bakbcsgFvX5iAbH8NoCRV2ao5unqTxumQDcWCRtugA7stPakkqHA4WsqKY/+RLPdqLagOcD859XIhbcDNngl7TXSXUuQNg2BS54avJMDhAMSLO47em7hLvmeJetn/ny7BYRl5vI7aylwhkkLglBwpLt5x9obF+8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611592049; 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=Irr3/weK+OEk/uRyCOapqgobtTdUG41AY4OFmrn1JEI=; b=MhZrpgFMmJIHnxKbE+E3eKbQC6pZ3CihkXc4Y9j+pjxXGpNWmVmYm1+XNsaqt9duwrL297xLNCmQp5qMp/MWxXBjn7ek4F7r8CU448zMdzu1kLm/1ysvrHluoTacS0gQ0rdurcQ5BglLSfViARe19x3G1IAZF5EYwKSQxy/qWZY= 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 161159204914180.97110433895307; Mon, 25 Jan 2021 08:27:29 -0800 (PST) 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-191-CICbuco1MleVd9F0QUrG6Q-1; Mon, 25 Jan 2021 11:27:23 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id A8D9C8049E1; Mon, 25 Jan 2021 16:27:01 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E96E857; Mon, 25 Jan 2021 16:26:59 +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 BB6E418095C7; Mon, 25 Jan 2021 16:26:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10PGO7Fj021399 for ; Mon, 25 Jan 2021 11:24:07 -0500 Received: by smtp.corp.redhat.com (Postfix) id BFFF410023B3; Mon, 25 Jan 2021 16:24:07 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-113-224.ams2.redhat.com [10.36.113.224]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8259F10013BD; Mon, 25 Jan 2021 16:24:04 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 120E51138468; Mon, 25 Jan 2021 17:24:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611592046; 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=Irr3/weK+OEk/uRyCOapqgobtTdUG41AY4OFmrn1JEI=; b=JvhNJMV7GM9KRp0BJYCTdUcxNV7ig5vKGX5dta1pSvnNh6B9IIaP0o/nPkDMtkBO5zVnZ6 NXFjsORskGXLCyIhDGrFgDtOpVYX52/cdW7CkiIkS6cCFRhci1Eyln7r6kXkcxcneJtyqO WE6x7r398F/zX8p1m53jTcvE77ITY9M= X-MC-Unique: CICbuco1MleVd9F0QUrG6Q-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 3/3] blockdev: Drop deprecated bogus -drive interface type Date: Mon, 25 Jan 2021 17:24:02 +0100 Message-Id: <20210125162402.1807394-4-armbru@redhat.com> In-Reply-To: <20210125162402.1807394-1-armbru@redhat.com> References: <20210125162402.1807394-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: kwolf@redhat.com, libvir-list@redhat.com, jsnow@redhat.com, qemu-block@nongnu.org, mreitz@redhat.com 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.16 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Drop the crap deprecated in commit a1b40bda08 "blockdev: Deprecate -drive with bogus interface type" (v5.1.0). Signed-off-by: Markus Armbruster --- docs/system/deprecated.rst | 7 ------ docs/system/removed-features.rst | 7 ++++++ include/sysemu/blockdev.h | 1 - blockdev.c | 37 +++++++++++++------------------- softmmu/vl.c | 8 +------ 5 files changed, 23 insertions(+), 37 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index ccbddc79ff..2d0c46ec63 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -94,13 +94,6 @@ QEMU 5.1 has three options: to the user to load all the images they need. 3. ``-bios `` - Tells QEMU to load the specified file as the firmwr= ae. =20 -``-drive`` with bogus interface type -'''''''''''''''''''''''''''''''''''' - -Drives with interface types other than ``if=3Dnone`` are for onboard -devices. It is possible to use drives the board doesn't pick up with --device. This usage is now deprecated. Use ``if=3Dnone`` instead. - Short-form boolean options (since 6.0) '''''''''''''''''''''''''''''''''''''' =20 diff --git a/docs/system/removed-features.rst b/docs/system/removed-feature= s.rst index d17c39bce3..61c3f504b0 100644 --- a/docs/system/removed-features.rst +++ b/docs/system/removed-features.rst @@ -64,6 +64,13 @@ become =20 -device floppy,unit=3D1,drive=3D... =20 +``-drive`` with bogus interface type (removed in 6.0) +''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Drives with interface types other than ``if=3Dnone`` are for onboard +devices. Drives the board doesn't pick up can no longer be used with +-device. Use ``if=3Dnone`` instead. + QEMU Machine Protocol (QMP) commands ------------------------------------ =20 diff --git a/include/sysemu/blockdev.h b/include/sysemu/blockdev.h index 3b5fcda08d..32c2d6023c 100644 --- a/include/sysemu/blockdev.h +++ b/include/sysemu/blockdev.h @@ -35,7 +35,6 @@ struct DriveInfo { bool is_default; /* Added by default_drive() ? */ int media_cd; QemuOpts *opts; - bool claimed_by_board; QTAILQ_ENTRY(DriveInfo) next; }; =20 diff --git a/blockdev.c b/blockdev.c index 2431448c5d..8e7be8b7b1 100644 --- a/blockdev.c +++ b/blockdev.c @@ -240,19 +240,10 @@ DriveInfo *drive_get(BlockInterfaceType type, int bus= , int unit) return NULL; } =20 -void drive_mark_claimed_by_board(void) -{ - BlockBackend *blk; - DriveInfo *dinfo; - - for (blk =3D blk_next(NULL); blk; blk =3D blk_next(blk)) { - dinfo =3D blk_legacy_dinfo(blk); - if (dinfo && blk_get_attached_dev(blk)) { - dinfo->claimed_by_board =3D true; - } - } -} - +/* + * Check board claimed all -drive that are meant to be claimed. + * Fatal error if any remain unclaimed. + */ void drive_check_orphaned(void) { BlockBackend *blk; @@ -262,7 +253,17 @@ void drive_check_orphaned(void) =20 for (blk =3D blk_next(NULL); blk; blk =3D blk_next(blk)) { dinfo =3D blk_legacy_dinfo(blk); - if (dinfo->is_default || dinfo->type =3D=3D IF_NONE) { + /* + * Ignore default drives, because we create certain default + * drives unconditionally, then leave them unclaimed. Not the + * users fault. + * Ignore IF_VIRTIO, because it gets desugared into -device, + * so we can leave failing to -device. + * Ignore IF_NONE, because leaving unclaimed IF_NONE remains + * available for device_add is a feature. + */ + if (dinfo->is_default || dinfo->type =3D=3D IF_VIRTIO + || dinfo->type =3D=3D IF_NONE) { continue; } if (!blk_get_attached_dev(blk)) { @@ -273,14 +274,6 @@ void drive_check_orphaned(void) if_name[dinfo->type], dinfo->bus, dinfo->unit); loc_pop(&loc); orphans =3D true; - continue; - } - if (!dinfo->claimed_by_board && dinfo->type !=3D IF_VIRTIO) { - loc_push_none(&loc); - qemu_opts_loc_restore(dinfo->opts); - warn_report("bogus if=3D%s is deprecated, use if=3Dnone", - if_name[dinfo->type]); - loc_pop(&loc); } } =20 diff --git a/softmmu/vl.c b/softmmu/vl.c index a8876b8965..81766cd568 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2454,13 +2454,7 @@ static void qemu_init_board(void) /* From here on we enter MACHINE_PHASE_INITIALIZED. */ machine_run_board_init(current_machine); =20 - /* - * TODO To drop support for deprecated bogus if=3D..., move - * drive_check_orphaned() here, replacing this call. Also drop - * its deprecation warning, along with DriveInfo member - * @claimed_by_board. - */ - drive_mark_claimed_by_board(); + drive_check_orphaned(); =20 realtime_init(); =20 --=20 2.26.2