From nobody Wed May 15 12:54:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1672314568; cv=none; d=zohomail.com; s=zohoarc; b=WljMGgP7gaKb00SwIIl69aNc66TEFvdyBj5vjpsts0Ki9v+Q+IEtzxyEkLFRYzSu4lQXUi66SXayS90pXnbKiOO9NLOz6ttHSFtZeLaM11ucqfvA/E7fjfySedfextaEEHcCqruaHTs2SxHCM41qserLXEbiQdJ7m5p+kl+0g2k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672314568; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=dgpZTGcvFMfKXYqy1GaXe5Qbls/Rjs4CnEqJV8VK78s=; b=fCLLqRJwkopk5qwTPJwV2iQPqkQdGCCBybMgFxyDxMgGkHFXYpel8sRyObxWzVyy8jf5/zwZj3szG6vJQnmAM3WTn5YL1nWnEZ06KmBwNf7IeXck446BVl3v+lT4opJmNJhW37qDJowaC4YAS5cFii2iTtJMuQe3Jl3OHZ8EZxQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1672314568763684.6554755181705; Thu, 29 Dec 2022 03:49:28 -0800 (PST) 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-178-g2w3FPPlOUWW_L-JGfZERw-1; Thu, 29 Dec 2022 06:49:25 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C0CAA3C0DDB7; Thu, 29 Dec 2022 11:49:23 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1CA0C492B06; Thu, 29 Dec 2022 11:49:21 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E9B001946587; Thu, 29 Dec 2022 11:49:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 143881946586 for ; Thu, 29 Dec 2022 11:49:17 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 9953240AE1EB; Thu, 29 Dec 2022 11:49:17 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.146]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A62D40AE1E9; Thu, 29 Dec 2022 11:49:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1672314568; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=dgpZTGcvFMfKXYqy1GaXe5Qbls/Rjs4CnEqJV8VK78s=; b=f8xw9HeaC8bMBVjScFwEC5KyKPJSsRwBw+kqXuJLSsXJziBwXUSPh61MB4PvAzZiCyrYCQ efDkiasjnucJHnr/40WWbx2MHiSsWouXTDWr1S9zdF2gLCxW9+GWTnrq5AfFMYHITogsQV PbpCzUzMx2mDEIUUll2rzX3Xkfxu0DQ= X-MC-Unique: g2w3FPPlOUWW_L-JGfZERw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Thomas Huth To: qemu-devel@nongnu.org Subject: [PATCH v2] i386: Deprecate the -no-hpet QEMU command line option Date: Thu, 29 Dec 2022 12:49:13 +0100 Message-Id: <20221229114913.260400-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: libvir-list@redhat.com, Paolo Bonzini Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1672314570224000001 Content-Type: text/plain; charset="utf-8"; x-default="true" The HPET setting has been turned into a machine property a while ago already, so we should finally do the next step and deprecate the legacy CLI option, too. Signed-off-by: Thomas Huth Reviewed-by: J=C3=A1n Tomko Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- v2: - Rebased to current version from master branch / adjusted version info - Dropped the descrpition in hw/i386/pc.c (already done via another patch) Note: The "hpet" property should now show up in the output of the "query-command-line-options" QMP command since commit 2f129fc107b4a, so it should be feasible for libvirt now to properly probe for the property . docs/about/deprecated.rst | 6 ++++++ softmmu/vl.c | 1 + qemu-options.hx | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 93affe3669..2ae6a79b21 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -114,6 +114,12 @@ form is preferred. Using ``-drive if=3Dnone`` to configure the OTP device of the sifive_u RISC-V machine is deprecated. Use ``-drive if=3Dpflash`` instead. =20 +``-no-hpet`` (since 8.0) +'''''''''''''''''''''''' + +The HPET setting has been turned into a machine property. +Use ``-machine hpet=3Doff`` instead. + =20 QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/softmmu/vl.c b/softmmu/vl.c index 798e1dc933..9bd0e52d01 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -3259,6 +3259,7 @@ void qemu_init(int argc, char **argv) qdict_put_str(machine_opts_dict, "acpi", "off"); break; case QEMU_OPTION_no_hpet: + warn_report("-no-hpet is deprecated, use '-machine hpet=3D= off' instead"); qdict_put_str(machine_opts_dict, "hpet", "off"); break; case QEMU_OPTION_no_reboot: diff --git a/qemu-options.hx b/qemu-options.hx index 7f99d15b23..a3adb4163e 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2542,7 +2542,7 @@ DEF("no-hpet", 0, QEMU_OPTION_no_hpet, "-no-hpet disable HPET\n", QEMU_ARCH_I386) SRST ``-no-hpet`` - Disable HPET support. + Disable HPET support. Deprecated, use '-machine hpet=3Doff' instead. ERST =20 DEF("acpitable", HAS_ARG, QEMU_OPTION_acpitable, --=20 2.31.1