From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 8/8] qemu-options: Belatedly document --watchdog-action inject-nmi
Date: Mon, 2 Oct 2017 16:03:07 +0200 [thread overview]
Message-ID: <20171002140307.5292-9-armbru@redhat.com> (raw)
In-Reply-To: <20171002140307.5292-1-armbru@redhat.com>
Missed in commit 795dc6e46d, v2.4.0.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
qemu-options.hx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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).
--
2.13.6
next prev parent reply other threads:[~2017-10-02 14:03 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-02 14:02 [Qemu-devel] [PATCH 0/8] qemu-options: Texinfo and --help fixes Markus Armbruster
2017-10-02 14:03 ` [Qemu-devel] [PATCH 1/8] qemu-options: Remove stray colons from output of --help Markus Armbruster
2017-10-02 15:25 ` Eric Blake
2017-10-04 10:13 ` Marc-André Lureau
2017-10-02 14:03 ` [Qemu-devel] [PATCH 2/8] qemu-options: Fix markup of -netdev l2tpv3 Markus Armbruster
2017-10-02 15:28 ` Eric Blake
2017-10-04 10:13 ` Marc-André Lureau
2017-10-02 14:03 ` [Qemu-devel] [PATCH 3/8] qemu-options qemu-doc: Move "Device URL Syntax" to qemu-doc Markus Armbruster
2017-10-02 15:31 ` Eric Blake
2017-10-04 10:12 ` Marc-André Lureau
2017-10-04 10:39 ` ronnie sahlberg
2017-10-04 12:53 ` Markus Armbruster
2017-10-02 14:03 ` [Qemu-devel] [PATCH 4/8] qemu-options: Move -iscsi under "Block device options" Markus Armbruster
2017-10-02 15:32 ` Eric Blake
2017-10-04 10:12 ` Marc-André Lureau
2017-10-04 10:33 ` ronnie sahlberg
2017-10-02 14:03 ` [Qemu-devel] [PATCH 5/8] qemu-options: Add missing -iscsi Texinfo documentation Markus Armbruster
2017-10-02 15:33 ` Eric Blake
2017-10-04 10:12 ` Marc-André Lureau
2017-10-04 13:02 ` Markus Armbruster
2017-10-04 10:31 ` ronnie sahlberg
2017-10-02 14:03 ` [Qemu-devel] [PATCH 6/8] qemu-options: Polish section "TPM device options" Markus Armbruster
2017-10-02 15:34 ` Eric Blake
2017-10-04 10:12 ` Marc-André Lureau
2017-10-02 14:03 ` [Qemu-devel] [PATCH 7/8] qemu-options: Polish section "Character " Markus Armbruster
2017-10-02 15:34 ` Eric Blake
2017-10-04 10:12 ` Marc-André Lureau
2017-10-02 14:03 ` Markus Armbruster [this message]
2017-10-02 15:35 ` [Qemu-devel] [PATCH 8/8] qemu-options: Belatedly document --watchdog-action inject-nmi Eric Blake
2017-10-04 10:12 ` Marc-André Lureau
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=20171002140307.5292-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).