On 10/02/2017 09:03 AM, Markus Armbruster wrote: > Missed in commit 795dc6e46d, v2.4.0. > > Signed-off-by: Markus Armbruster <[email protected]> > --- > qemu-options.hx | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-)
Reviewed-by: Eric Blake <[email protected]> > > diff --git a/qemu-options.hx b/qemu-options.hx > index b792c65149..32afc11296 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -3596,7 +3596,7 @@ A virtual watchdog for s390x backed by the diagnose 288 > hypercall > ETEXI > > DEF("watchdog-action", HAS_ARG, QEMU_OPTION_watchdog_action, \ > - "-watchdog-action reset|shutdown|poweroff|pause|debug|none\n" \ > + "-watchdog-action reset|shutdown|poweroff|inject-nmi|pause|debug|none\n" > \ > " action when watchdog fires [default=reset]\n", > QEMU_ARCH_ALL) > STEXI > @@ -3610,6 +3610,7 @@ The default is > Other possible actions are: > @code{shutdown} (attempt to gracefully shutdown the guest), > @code{poweroff} (forcefully poweroff the guest), > +@code{inject-nmi} (inject a NMI into the guest), > @code{pause} (pause the guest), > @code{debug} (print a debug message and continue), or > @code{none} (do nothing). > -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
signature.asc
Description: OpenPGP digital signature
