From nobody Mon Feb 9 05:41:39 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513758264966960.9206733117317; Wed, 20 Dec 2017 00:24:24 -0800 (PST) Received: from localhost ([::1]:39531 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eRZfn-00057r-Ug for importer@patchew.org; Wed, 20 Dec 2017 03:24:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35817) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eRZbB-0001NF-Lq for qemu-devel@nongnu.org; Wed, 20 Dec 2017 03:19:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eRZbA-0002ae-BK for qemu-devel@nongnu.org; Wed, 20 Dec 2017 03:19:33 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49494) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eRZbA-0002Zn-3B for qemu-devel@nongnu.org; Wed, 20 Dec 2017 03:19:32 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 473E2C013C25 for ; Wed, 20 Dec 2017 08:19:31 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-74.ams2.redhat.com [10.36.116.74]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1720F1853B for ; Wed, 20 Dec 2017 08:19:31 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id BEA341138656; Wed, 20 Dec 2017 09:19:27 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 20 Dec 2017 09:19:25 +0100 Message-Id: <20171220081927.8761-9-armbru@redhat.com> In-Reply-To: <20171220081927.8761-1-armbru@redhat.com> References: <20171220081927.8761-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 20 Dec 2017 08:19:31 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL v2 08/10] qemu-options: Belatedly document --watchdog-action inject-nmi X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Missed in commit 795dc6e46d, v2.4.0. Signed-off-by: Markus Armbruster Reviewed-by: Marc-Andr=C3=A9 Lureau --- 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 2= 88 hypercall ETEXI =20 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=3Dreset]\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). --=20 2.13.6