OSDN Git Service

watchdog: remove select_watchdog_action
authorPaolo Bonzini <pbonzini@redhat.com>
Wed, 27 Oct 2021 13:03:04 +0000 (15:03 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Tue, 2 Nov 2021 14:57:27 +0000 (15:57 +0100)
commit22afb46e7c6ed61bd41c199072cb4769d6ab14b2
treedcde55a5d193315ccc10a9207c7ad198a43bbde3
parentd12b64eaebd9f0df03c70422336c669a44ed2937
watchdog: remove select_watchdog_action

Instead of invoking select_watchdog_action from both HMP and command line,
go directly from HMP to QMP and use QemuOpts as the intermediary for the
command line.

This makes -watchdog-action explicitly a shortcut for "-action watchdog",
so that "-watchdog-action" and "-action watchdog" override each other
based on the position on the command line; previously, "-action watchdog"
always won.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
hw/watchdog/watchdog.c
include/sysemu/watchdog.h
monitor/misc.c
softmmu/vl.c