diff options
-rw-r--r-- | docs/about/deprecated.rst | 6 | ||||
-rw-r--r-- | docs/about/removed-features.rst | 8 | ||||
-rw-r--r-- | qemu-options.hx | 7 | ||||
-rw-r--r-- | system/vl.c | 4 |
4 files changed, 8 insertions, 17 deletions
diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 2e15040246..3dcb652132 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -63,12 +63,6 @@ as short-form boolean values, and passed to plugins as ``arg_name=on``. However, short-form booleans are deprecated and full explicit ``arg_name=on`` form is preferred. -``-no-hpet`` (since 8.0) -'''''''''''''''''''''''' - -The HPET setting has been turned into a machine property. -Use ``-machine hpet=off`` instead. - ``-no-acpi`` (since 8.0) '''''''''''''''''''''''' diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index f04036987b..52d240ade9 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -460,6 +460,14 @@ in this case. Note that the default audio backend must be configured on the command line if the ``-nodefaults`` options is used. +``-no-hpet`` (removed in 9.0) +''''''''''''''''''''''''''''' + +The HPET setting has been turned into a machine property. +Use ``-machine hpet=off`` instead. + + + QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/qemu-options.hx b/qemu-options.hx index 1912b19cb8..38d38abd6d 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2656,13 +2656,6 @@ SRST machine only). ERST -DEF("no-hpet", 0, QEMU_OPTION_no_hpet, - "-no-hpet disable HPET\n", QEMU_ARCH_I386) -SRST -``-no-hpet`` - Disable HPET support. Deprecated, use '-machine hpet=off' instead. -ERST - DEF("acpitable", HAS_ARG, QEMU_OPTION_acpitable, "-acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,{data|file}=file1[:file2]...]\n" " ACPI table description\n", QEMU_ARCH_I386) diff --git a/system/vl.c b/system/vl.c index 53850a1daf..f08c4c8193 100644 --- a/system/vl.c +++ b/system/vl.c @@ -3373,10 +3373,6 @@ void qemu_init(int argc, char **argv) warn_report("-no-acpi is deprecated, use '-machine acpi=off' instead"); 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: olist = qemu_find_opts("action"); qemu_opts_parse_noisily(olist, "reboot=shutdown", false); |