From nobody Sat Jul 27 06:38:57 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675160020; cv=none; d=zohomail.com; s=zohoarc; b=boFduD8B+/PHxSEIQdHkqynxOY5kK+tyXW46STPBB82oY2aqwPUC3N6JcvOVfkwljfmwtJlGHI8xQrFlawGh+Jyek55+87NXpelkXpwMPlPCL7nWyCHtNXxkxE/Wwbij76KZoxZu21o7Dh+5TvMLASXP+ZqdTV++kVz1b65nQ1A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675160020; 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=rdK/+AoDaGLQgehzH10GvHzz6+INd1sB5CAkEhxPE54=; b=Cowk4I/YTCtk3iT8Z9rm8XfcT5QIgLzkMCjoMRAh3BD6j/0cYEQUc9sMlj/nQcvOxrrTukQX2AB4bJQl8mj1jbEAz8OppRdejaLaFcycjY4QXciWjoMBEfX90eio8wTD5jAOYKmnTTmM2dIm3GW3oohmNw5w5JXIvPVJ9CkNsKc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 167516002065291.41910405866258; Tue, 31 Jan 2023 02:13:40 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pMndG-0002op-F0; Tue, 31 Jan 2023 05:12:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMncr-0002Jv-VD for qemu-devel@nongnu.org; Tue, 31 Jan 2023 05:12:30 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pMnck-0002Uj-8G for qemu-devel@nongnu.org; Tue, 31 Jan 2023 05:12:27 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-357-K-qOOsi2O1mTnMEm1IsPxg-1; Tue, 31 Jan 2023 05:12:14 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 62F043C0218D; Tue, 31 Jan 2023 10:12:13 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.188]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6A4D2C15BAE; Tue, 31 Jan 2023 10:12:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675159941; 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=rdK/+AoDaGLQgehzH10GvHzz6+INd1sB5CAkEhxPE54=; b=W/Zcid+t4e7yl4vPZ6iACUHLLBEfp7qXn9oxzIP5VrLIEVgybOVErrVgKkxT+ZItLw7sbv qipjxV3QWFejBPBICEGZOA3EWr1BwGB1EXvkEi0ePjX5xoSLXXRchTmUY/0y5Z9WLOEmwO lYV0dqBw6GztfjfVPMKsAdVGhhIpc7Q= X-MC-Unique: K-qOOsi2O1mTnMEm1IsPxg-1 From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Cc: Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 04/27] hw/misc/sifive_u_otp: Remove the deprecated OTP config with '-drive if=none' Date: Tue, 31 Jan 2023 11:11:42 +0100 Message-Id: <20230131101205.1499867-5-thuth@redhat.com> In-Reply-To: <20230131101205.1499867-1-thuth@redhat.com> References: <20230131101205.1499867-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675160021748100001 '-drive if=3Dnone' is meant for configuring back-end devices only, so this got marked as deprecated in QEMU 6.2. Users should now only use the new way with '-drive if=3Dpflash' instead. Message-Id: <20230112083921.887828-1-thuth@redhat.com> Reviewed-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- docs/about/deprecated.rst | 6 ------ docs/about/removed-features.rst | 7 +++++++ hw/misc/sifive_u_otp.c | 7 ------- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 9f1bbc495d..3f4d678eb4 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -87,12 +87,6 @@ as short-form boolean values, and passed to plugins as `= `arg_name=3Don``. However, short-form booleans are deprecated and full explicit ``arg_name= =3Don`` form is preferred. =20 -``-drive if=3Dnone`` for the sifive_u OTP device (since 6.2) -'''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - -Using ``-drive if=3Dnone`` to configure the OTP device of the sifive_u -RISC-V machine is deprecated. Use ``-drive if=3Dpflash`` instead. - ``-no-hpet`` (since 8.0) '''''''''''''''''''''''' =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index 6c3aa5097f..a17d0554d6 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -422,6 +422,13 @@ the value is hexadecimal. That is, '0x20M' should be = written either as ``tty`` and ``parport`` used to be aliases for ``serial`` and ``parallel`` respectively. The actual backend names should be used instead. =20 +``-drive if=3Dnone`` for the sifive_u OTP device (removed in 8.0) +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Use ``-drive if=3Dpflash`` to configure the OTP device of the sifive_u +RISC-V machine instead. + + QEMU Machine Protocol (QMP) commands ------------------------------------ =20 diff --git a/hw/misc/sifive_u_otp.c b/hw/misc/sifive_u_otp.c index 6d7fdb040a..8965f5c22a 100644 --- a/hw/misc/sifive_u_otp.c +++ b/hw/misc/sifive_u_otp.c @@ -210,13 +210,6 @@ static void sifive_u_otp_realize(DeviceState *dev, Err= or **errp) sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->mmio); =20 dinfo =3D drive_get(IF_PFLASH, 0, 0); - if (!dinfo) { - dinfo =3D drive_get(IF_NONE, 0, 0); - if (dinfo) { - warn_report("using \"-drive if=3Dnone\" for the OTP is depreca= ted, " - "use \"-drive if=3Dpflash\" instead."); - } - } if (dinfo) { int ret; uint64_t perm; --=20 2.31.1