aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--qapi/machine.json20
-rw-r--r--qapi/misc.json20
-rw-r--r--softmmu/cpus.c1
3 files changed, 21 insertions, 20 deletions
diff --git a/qapi/machine.json b/qapi/machine.json
index 756dacb..073b1c9 100644
--- a/qapi/machine.json
+++ b/qapi/machine.json
@@ -485,6 +485,26 @@
'data': ['discard', 'delay', 'slew' ] }
##
+# @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' }
+
+##
# @NumaOptionsType:
#
# @node: NUMA nodes configuration
diff --git a/qapi/misc.json b/qapi/misc.json
index 7d1e2e9..3fe9cc2 100644
--- a/qapi/misc.json
+++ b/qapi/misc.json
@@ -342,26 +342,6 @@
{ 'command': 'system_wakeup' }
##
-# @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' }
-
-##
# @human-monitor-command:
#
# Execute a command on the human monitor and return the output.
diff --git a/softmmu/cpus.c b/softmmu/cpus.c
index 47ccedd..e46ac68 100644
--- a/softmmu/cpus.c
+++ b/softmmu/cpus.c
@@ -26,6 +26,7 @@
#include "qemu-common.h"
#include "monitor/monitor.h"
#include "qapi/error.h"
+#include "qapi/qapi-commands-machine.h"
#include "qapi/qapi-commands-misc.h"
#include "qapi/qapi-events-run-state.h"
#include "qapi/qmp/qerror.h"