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 <thuth@redhat.com>
---
 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=none`` to configure the OTP device of the sifive_u
 RISC-V machine is deprecated. Use ``-drive if=pflash`` instead.
 
+``-no-hpet`` (since 8.0)
+''''''''''''''''''''''''
+
+The HPET setting has been turned into a machine property.
+Use ``-machine hpet=off`` instead.
+
 
 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=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=off' instead.
 ERST
 
 DEF("acpitable", HAS_ARG, QEMU_OPTION_acpitable,
-- 
2.31.1

On a Thursday in 2022, Thomas Huth wrote:
>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 <thuth@redhat.com>
>---
> 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(-)
>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

Jano

On Thu, Dec 29, 2022 at 12:49:13 +0100, Thomas Huth wrote:
> 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 <thuth@redhat.com>
> ---
>  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(-)

Libvirt currently still uses '-no-hpet' but adapting to configure it via
machine should be straightforward. I'll post the patches soon hopefully.

On 29/12/22 12:49, Thomas Huth wrote:
> 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 <thuth@redhat.com>
> ---
>   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(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>