Patchwork [V4,3/3] qmp, nmi: convert do_inject_nmi() to QObject, QError

login
register
mail settings
Submitter Lai Jiangshan
Date Dec. 20, 2010, 6:11 a.m.
Message ID <4D0EF3A4.7000303@cn.fujitsu.com>
Download mbox | patch
Permalink /patch/76170/
State New
Headers show

Comments

Lai Jiangshan - Dec. 20, 2010, 6:11 a.m.
Make we can inject NMI via qemu-monitor-protocol.
We use "inject-nmi" for the qmp command name, the meaning is clearer.
When cpu-index is found invalid in runtime, it will report
QERR_INVALID_PARAMETER_VALUE.

Signed-off-by:  Lai Jiangshan <laijs@cn.fujitsu.com>
---
Markus Armbruster - Dec. 20, 2010, 5:01 p.m.
Lai Jiangshan <laijs@cn.fujitsu.com> writes:

> Make we can inject NMI via qemu-monitor-protocol.
> We use "inject-nmi" for the qmp command name, the meaning is clearer.
> When cpu-index is found invalid in runtime, it will report
> QERR_INVALID_PARAMETER_VALUE.

This patch does two separate things:

1. Fix do_inject_nmi() to detect invalid arguments.

2. Convert it to QObject.

If you have to respin anyway, please split the patch to keep the two
separate.

Patch

diff --git a/hmp-commands.hx b/hmp-commands.hx
index d8fe4c0..f6d4c2f 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -724,7 +724,8 @@  ETEXI
         .args_type  = "cpu-index:i?",
         .params     = "[cpu]",
         .help       = "inject an NMI on all CPUs or the given 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 45a8dc2..d90d6f5 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2407,7 +2407,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 = qdict_get_try_int(qdict, "cpu-index", -1);
@@ -2415,14 +2415,17 @@  static void do_inject_nmi(Monitor *mon, const QDict *qdict)
     if (cpu_index == -1) {
         for (env = first_cpu; env != NULL; env = env->next_cpu)
             cpu_interrupt(env, CPU_INTERRUPT_NMI);
-        return;
+        return 0;
     }
 
     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;
         }
+
+    qerror_report(QERR_INVALID_PARAMETER_VALUE, "cpu-index", "a CPU number");
+    return -1;
 }
 #endif
 
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 3486223..8cca5c3 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -429,6 +429,33 @@  Example:
 
 EQMP
 
+#if defined(TARGET_I386)
+    {
+        .name       = "inject_nmi",
+        .args_type  = "cpu-index:i?",
+        .params     = "[cpu]",
+        .help       = "inject an NMI on all CPUs or the given CPU",
+        .user_print = monitor_user_noop,
+        .mhandler.cmd_new = do_inject_nmi,
+    },
+#endif
+SQMP
+inject_nmi
+----------
+
+Inject an NMI on the given CPU (x86 only).
+
+Arguments:
+
+- "cpu_index": the index of the CPU to be injected NMI (json-int)
+
+Example:
+
+-> { "execute": "inject_nmi", "arguments": { "cpu-index": 0 } }
+<- { "return": {} }
+
+EQMP
+
     {
         .name       = "migrate",
         .args_type  = "detach:-d,blk:-b,inc:-i,uri:s",