Patchwork [V6,3/4,resend] qmp, nmi: convert do_inject_nmi() to QObject

login
register
mail settings
Submitter Lai Jiangshan
Date Feb. 14, 2011, 10:09 a.m.
Message ID <4D58FF52.2000106@cn.fujitsu.com>
Download mbox | patch
Permalink /patch/83058/
State New
Headers show

Comments

Lai Jiangshan - Feb. 14, 2011, 10:09 a.m.
Make we can inject NMI via qemu-monitor-protocol.
We use "inject-nmi" for the qmp command name, the meaning is clearer.

Signed-off-by:  Lai Jiangshan <laijs@cn.fujitsu.com>
---

Patch

diff --git a/hmp-commands.hx b/hmp-commands.hx
index b2c6cd6..6d3e7d2 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -744,7 +744,8 @@  ETEXI
         .params     = "[cpu]",
         .help       = "Inject an NMI on all CPUs if no argument is given, "
                       "otherwise inject it on the specified CPU",
-        .mhandler.cmd = do_inject_nmi,
+        .user_print = monitor_user_noop,
+        .mhandler.cmd_new = do_inject_nmi,
     },
 #endif
 STEXI
diff --git a/monitor.c b/monitor.c
index c1123ae..3cdb768 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2555,7 +2555,7 @@  static void do_wav_capture(Monitor *mon, const QDict *qdict)
 #endif
 
 #if defined(TARGET_I386)
-static void do_inject_nmi(Monitor *mon, const QDict *qdict)
+static int do_inject_nmi(Monitor *mon, const QDict *qdict, QObject **ret_data)
 {
     CPUState *env;
     int cpu_index;
@@ -2563,15 +2563,17 @@  static void do_inject_nmi(Monitor *mon, const QDict *qdict)
     if (!qdict_haskey(qdict, "cpu-index")) {
         for (env = first_cpu; env != NULL; env = env->next_cpu)
             cpu_interrupt(env, CPU_INTERRUPT_NMI);
-        return;
+        return 0;
     }
 
     cpu_index = qdict_get_int(qdict, "cpu-index");
     for (env = first_cpu; env != NULL; env = env->next_cpu)
         if (env->cpu_index == cpu_index) {
             cpu_interrupt(env, CPU_INTERRUPT_NMI);
-            break;
+            return 0;
         }
+
+    return -1;
 }
 #endif
 
diff --git a/qmp-commands.hx b/qmp-commands.hx
index df40a3d..40b8c13 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -429,6 +429,34 @@  Example:
 
 EQMP
 
+#if defined(TARGET_I386)
+    {
+        .name       = "inject-nmi",
+        .args_type  = "cpu-index:i?",
+        .params     = "[cpu]",
+        .help       = "Inject an NMI on all CPUs if no argument is given, "
+                      "otherwise inject it on the specified CPU",
+        .user_print = monitor_user_noop,
+        .mhandler.cmd_new = do_inject_nmi,
+    },
+#endif
+SQMP
+inject-nmi
+----------
+
+Inject an NMI on all CPUs or the given CPU (x86 only).
+
+Arguments:
+
+- "cpu-index": the index of the CPU to be injected NMI (json-int, optional)
+
+Example:
+
+-> { "execute": "inject-nmi", "arguments": { "cpu-index": 0 } }
+<- { "return": {} }
+
+EQMP
+
     {
         .name       = "migrate",
         .args_type  = "detach:-d,blk:-b,inc:-i,uri:s",