diff options
| author | Paolo Bonzini | 2022-09-10 13:44:47 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2022-09-29 11:40:28 +0200 |
| commit | 5433af7697ba97531d97e16e721cfe8a90722198 (patch) | |
| tree | c0249d5dd7c856e3b07cb80b064ffa7f729b77fd /qemu-options.hx | |
| parent | configure: do not invoke as/ld directly for pc-bios/optionrom (diff) | |
| download | qemu-5433af7697ba97531d97e16e721cfe8a90722198.tar.gz qemu-5433af7697ba97531d97e16e721cfe8a90722198.tar.xz qemu-5433af7697ba97531d97e16e721cfe8a90722198.zip | |
watchdog: remove -watchdog option
This was deprecated in 6.2 and is ready to go. It removes quite a bit
of code that handled the registration of watchdog models.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'qemu-options.hx')
| -rw-r--r-- | qemu-options.hx | 33 |
1 files changed, 2 insertions, 31 deletions
diff --git a/qemu-options.hx b/qemu-options.hx index d8b5ce5b43..df4b8c8f1a 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4330,7 +4330,7 @@ SRST ``-action panic=none`` ``-action reboot=shutdown,shutdown=pause`` - ``-watchdog i6300esb -action watchdog=pause`` + ``-device i6300esb -action watchdog=pause`` ERST @@ -4448,35 +4448,6 @@ SRST specifies the snapshot name used to load the initial VM state. ERST -DEF("watchdog", HAS_ARG, QEMU_OPTION_watchdog, \ - "-watchdog model\n" \ - " enable virtual hardware watchdog [default=none]\n", - QEMU_ARCH_ALL) -SRST -``-watchdog model`` - Create a virtual hardware watchdog device. Once enabled (by a guest - action), the watchdog must be periodically polled by an agent inside - the guest or else the guest will be restarted. Choose a model for - which your guest has drivers. - - The model is the model of hardware watchdog to emulate. Use - ``-watchdog help`` to list available hardware models. Only one - watchdog can be enabled for a guest. - - The following models may be available: - - ``ib700`` - iBASE 700 is a very simple ISA watchdog with a single timer. - - ``i6300esb`` - Intel 6300ESB I/O controller hub is a much more featureful - PCI-based dual-timer watchdog. - - ``diag288`` - A virtual watchdog for s390x backed by the diagnose 288 - hypercall (currently KVM only). -ERST - DEF("watchdog-action", HAS_ARG, QEMU_OPTION_watchdog_action, \ "-watchdog-action reset|shutdown|poweroff|inject-nmi|pause|debug|none\n" \ " action when watchdog fires [default=reset]\n", @@ -4498,7 +4469,7 @@ SRST Examples: - ``-watchdog i6300esb -watchdog-action pause``; \ ``-watchdog ib700`` + ``-device i6300esb -watchdog-action pause`` ERST |