diff options
| author | Thomas Huth <thuth@redhat.com> | 2022-12-29 12:49:13 +0100 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2023-01-09 13:50:47 +0100 |
| commit | df37330c05fbc4bff26c28588d60c302332db0b1 (patch) | |
| tree | 77795a39d857a06dc4c813c582348ca8dc3ac7a2 | |
| parent | 9a2112f9aeb01dee8c0ff6d9158bb0c38879be21 (diff) | |
| download | qemu-df37330c05fbc4bff26c28588d60c302332db0b1.zip qemu-df37330c05fbc4bff26c28588d60c302332db0b1.tar.gz qemu-df37330c05fbc4bff26c28588d60c302332db0b1.tar.bz2 | |
i386: Deprecate the -no-hpet QEMU command line option
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.
Message-Id: <20221229114913.260400-1-thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
| -rw-r--r-- | docs/about/deprecated.rst | 6 | ||||
| -rw-r--r-- | qemu-options.hx | 2 | ||||
| -rw-r--r-- | softmmu/vl.c | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 93affe3..2ae6a79 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/qemu-options.hx b/qemu-options.hx index 7f99d15..a3adb41 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, diff --git a/softmmu/vl.c b/softmmu/vl.c index 798e1dc..9bd0e52 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: |