From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL v2 08/10] qemu-options: Belatedly document --watchdog-action inject-nmi
Date: Wed, 20 Dec 2017 09:19:25 +0100 [thread overview]
Message-ID: <20171220081927.8761-9-armbru@redhat.com> (raw)
In-Reply-To: <20171220081927.8761-1-armbru@redhat.com>
Missed in commit 795dc6e46d, v2.4.0.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
qemu-options.hx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/qemu-options.hx b/qemu-options.hx
index 80b2331a32..84f41e6ac4 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -3622,7 +3622,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
@@ -3636,6 +3636,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).
--
2.13.6
next prev parent reply other threads:[~2017-12-20 8:19 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-20 8:19 [Qemu-devel] [PULL v2 00/10] Command line patches for 2017-12-18 Markus Armbruster
2017-12-20 8:19 ` [Qemu-devel] [PULL v2 01/10] qemu-options: Remove stray colons from output of --help Markus Armbruster
2017-12-20 8:19 ` [Qemu-devel] [PULL v2 02/10] qemu-options: Fix markup of -netdev l2tpv3 Markus Armbruster
2017-12-20 8:19 ` [Qemu-devel] [PULL v2 03/10] qemu-options qemu-doc: Move "Device URL Syntax" to qemu-doc Markus Armbruster
2017-12-20 8:19 ` [Qemu-devel] [PULL v2 04/10] qemu-options: Move -iscsi under "Block device options" Markus Armbruster
2017-12-20 8:19 ` [Qemu-devel] [PULL v2 05/10] qemu-options: Add missing -iscsi Texinfo documentation Markus Armbruster
2017-12-20 8:19 ` [Qemu-devel] [PULL v2 06/10] qemu-options: Polish section "TPM device options" Markus Armbruster
2017-12-20 8:19 ` [Qemu-devel] [PULL v2 07/10] qemu-options: Polish section "Character " Markus Armbruster
2017-12-20 8:19 ` Markus Armbruster [this message]
2017-12-20 8:19 ` [Qemu-devel] [PULL v2 09/10] option: Remove shadowing opt decl from qemu_opt_print() Markus Armbruster
2017-12-20 8:19 ` [Qemu-devel] [PULL v2 10/10] option: Drop unused get_param_value(), get_next_param_value() Markus Armbruster
2017-12-20 15:26 ` [Qemu-devel] [PULL v2 00/10] Command line patches for 2017-12-18 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171220081927.8761-9-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).