From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E0CAC433DB for ; Wed, 10 Mar 2021 08:16:46 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D8E7A64F77 for ; Wed, 10 Mar 2021 08:16:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D8E7A64F77 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56864 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJu1M-0006LA-Q2 for qemu-devel@archiver.kernel.org; Wed, 10 Mar 2021 03:16:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35684) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJtvU-0007GE-4g for qemu-devel@nongnu.org; Wed, 10 Mar 2021 03:10:40 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:25653) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lJtvM-0000j4-Bl for qemu-devel@nongnu.org; Wed, 10 Mar 2021 03:10:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615363830; h=from:from: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; bh=c7WFNZa0WlyannHkPDvlwPdKEU0RDPWLdBGLYkfsqug=; b=ha44AAWrbQepuTWUTEYfvRJl2j3lEqUKCB+lo0IBjSUpR9j2BDiYX/BpXuCYYMyGgEW7e0 S35QJ6/qND8gwE2WngNphJ53S/ZXoHviEKMX/i3gBcO2okbfphVhB+GdHQ3LwruH3neWmV lbITww8h/IIwrR5SKoEkP/WnhY+cFpA= 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-258-zlCc1S4uM9OaV2JvFN2bIg-1; Wed, 10 Mar 2021 03:10:28 -0500 X-MC-Unique: zlCc1S4uM9OaV2JvFN2bIg-1 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 83FC0801503; Wed, 10 Mar 2021 08:10:27 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-83.phx2.redhat.com [10.3.112.83]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E937A5D9DB; Wed, 10 Mar 2021 08:10:23 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 5B6C61132C12; Wed, 10 Mar 2021 09:10:22 +0100 (CET) From: Markus Armbruster To: Daniel P. =?utf-8?Q?Berrang=C3=A9?= Subject: Re: [PATCH v3 4/4] blockdev: Drop deprecated bogus -drive interface type References: <20210309161214.1402527-1-armbru@redhat.com> <20210309161214.1402527-5-armbru@redhat.com> Date: Wed, 10 Mar 2021 09:10:22 +0100 In-Reply-To: ("Daniel P. =?utf-8?Q?Berrang?= =?utf-8?Q?=C3=A9=22's?= message of "Tue, 9 Mar 2021 16:18:28 +0000") Message-ID: <87pn0777kh.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.251, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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-block@nongnu.org, libvir-list@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com, jsnow@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Daniel P. Berrang=C3=A9 writes: > On Tue, Mar 09, 2021 at 05:12:13PM +0100, Markus Armbruster wrote: >> Drop the crap deprecated in commit a1b40bda08 "blockdev: Deprecate >> -drive with bogus interface type" (v5.1.0). >>=20 >> 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(-) >>=20 >> diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst >> index 601e9647a5..664ed60e9f 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 fir= mwrae. >> =20 >> -``-drive`` with bogus interface type (since 5.1) >> -'''''''''''''''''''''''''''''''''''''''''''''''' >> - >> -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-feat= ures.rst >> index 77e7ba1339..e6d2fbe798 100644 >> --- a/docs/system/removed-features.rst >> +++ b/docs/system/removed-features.rst >> @@ -87,6 +87,13 @@ becomes >> -device isa-fdc,... >> -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 cd438e60e3..2e01889cff 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 ff488ea3e7..7453611152 100644 >> --- a/softmmu/vl.c >> +++ b/softmmu/vl.c >> @@ -2460,13 +2460,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(); > > This method is already called by qemu_machine_creation_done(), which is > invoked shortly after this qemu_init_board() is run. > > So either this added instance, or the later call to drive_check_orphaned > feels redundant You're right. I'll drop the one in qemu_machine_creation_done(). Rationale: * Before the patch, we reject -drive if=3DT when T !=3D none and nothing claimed it. We warn unless the board claimed it. "Nothing claimed it" is known only after qemu_create_cli_devices(). * After the patch, we reject -drive if=3DT when T !=3D none and the board didn't claim it. This is known earlier, after machine_run_board_init().