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 /softmmu | |
| 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 'softmmu')
| -rw-r--r-- | softmmu/vl.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/softmmu/vl.c b/softmmu/vl.c index e62b9cc35d..b8788e765a 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -53,7 +53,6 @@ #include "hw/isa/isa.h" #include "hw/scsi/scsi.h" #include "hw/display/vga.h" -#include "sysemu/watchdog.h" #include "hw/firmware/smbios.h" #include "hw/acpi/acpi.h" #include "hw/xen/xen.h" @@ -181,7 +180,6 @@ static Chardev **serial_hds; static const char *log_mask; static const char *log_file; static bool list_data_dirs; -static const char *watchdog; static const char *qtest_chrdev; static const char *qtest_log; @@ -2329,12 +2327,6 @@ static void qemu_process_sugar_options(void) } object_register_sugar_prop("memory-backend", "prealloc", "on", false); } - - if (watchdog) { - int i = select_watchdog(watchdog); - if (i > 0) - exit (i == 1 ? 1 : 0); - } } /* -action processing */ @@ -3107,14 +3099,6 @@ void qemu_init(int argc, char **argv, char **envp) default_monitor = 0; } break; - case QEMU_OPTION_watchdog: - if (watchdog) { - error_report("only one watchdog option may be given"); - exit(1); - } - warn_report("-watchdog is deprecated; use -device instead."); - watchdog = optarg; - break; case QEMU_OPTION_action: olist = qemu_find_opts("action"); if (!qemu_opts_parse_noisily(olist, optarg, false)) { |