Skip to content

Commit

Permalink
qemu-options: Remove the deprecated -no-hpet option
Browse files Browse the repository at this point in the history
It's been marked as deprecated since QEMU 8.0, so it should be fine
to remove this now.

Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240118103759.130748-2-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
  • Loading branch information
huth committed Jan 19, 2024
1 parent 68c691c commit 48c1c25
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 17 deletions.
6 changes: 0 additions & 6 deletions docs/about/deprecated.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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)
''''''''''''''''''''''''

Expand Down
8 changes: 8 additions & 0 deletions docs/about/removed-features.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
------------------------------------

Expand Down
7 changes: 0 additions & 7 deletions qemu-options.hx
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 0 additions & 4 deletions system/vl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 48c1c25

Please sign in to comment.