From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Thu, 23 Jun 2016 11:08:44 +0000 (+0200)
Subject: qmp-commands: move 'inject-nmi' doc to schema
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=149ea099cdee4857f9af7125682f7dadf23c8ac8;p=qemu.git

qmp-commands: move 'inject-nmi' doc to schema

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---

diff --git a/docs/qmp-commands.txt b/docs/qmp-commands.txt
index 2361e84c8f..ba4fd1ccda 100644
--- a/docs/qmp-commands.txt
+++ b/docs/qmp-commands.txt
@@ -195,20 +195,6 @@ Example:
 
 Note: CPUs' indexes are obtained with the 'query-cpus' command.
 
-inject-nmi
-----------
-
-Inject an NMI on the default CPU (x86/s390) or all CPUs (ppc64).
-
-Arguments: None.
-
-Example:
-
--> { "execute": "inject-nmi" }
-<- { "return": {} }
-
-Note: inject-nmi fails when the guest doesn't support injecting.
-
 xen-save-devices-state
 -------
 
diff --git a/qapi-schema.json b/qapi-schema.json
index 5a2716ceb3..1675a9bf16 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -2319,12 +2319,19 @@
 # @inject-nmi:
 #
 # Injects a Non-Maskable Interrupt into the default CPU (x86/s390) or all CPUs (ppc64).
+# The command fails when the guest doesn't support injecting.
 #
 # Returns:  If successful, nothing
 #
 # Since:  0.14.0
 #
 # Note: prior to 2.1, this command was only supported for x86 and s390 VMs
+#
+# Example:
+#
+# -> { "execute": "inject-nmi" }
+# <- { "return": {} }
+#
 ##
 { 'command': 'inject-nmi' }