[PATCH for-7.0] i386: Deprecate the -no-hpet QEMU command line option

[Thomas Huth]

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.
While we're at it, add a proper help text for the machine property, too.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 docs/about/deprecated.rst | 6 ++++++
 hw/i386/pc.c              | 2 ++
 qemu-options.hx           | 2 +-
 softmmu/vl.c              | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index 5693abb663..1dfe69aa6a 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -198,6 +198,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 7.0)
+''''''''''''''''''''''''
+
+The HPET setting has been turned into a machine property.
+Use ``-machine hpet=off`` instead.
+
 
 QEMU Machine Protocol (QMP) commands
 ------------------------------------
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index a2ef40ecbc..0ab6e67afe 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1743,6 +1743,8 @@ static void pc_machine_class_init(ObjectClass *oc, void 
*data)
 
     object_class_property_add_bool(oc, "hpet",
         pc_machine_get_hpet, pc_machine_set_hpet);
+    object_class_property_set_description(oc, "hpet",
+        "High precision event timer emulation");
 
     object_class_property_add_bool(oc, "default-bus-bypass-iommu",
         pc_machine_get_default_bus_bypass_iommu,
diff --git a/qemu-options.hx b/qemu-options.hx
index ae2c6dbbfc..7b921fcbe3 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2436,7 +2436,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,
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 620a1f1367..471ed006eb 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -3418,6 +3418,7 @@ void qemu_init(int argc, char **argv, char **envp)
                 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:
-- 
2.27.0