From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=54523 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PUYxC-0001k3-Dy
	for qemu-devel@nongnu.org; Mon, 20 Dec 2010 01:10:56 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <laijs@cn.fujitsu.com>) id 1PUYww-0006PS-P5
	for qemu-devel@nongnu.org; Mon, 20 Dec 2010 01:10:38 -0500
Received: from [222.73.24.84] (port=53911 helo=song.cn.fujitsu.com)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <laijs@cn.fujitsu.com>) id 1PUYwv-0006Oo-Jv
	for qemu-devel@nongnu.org; Mon, 20 Dec 2010 01:10:22 -0500
Message-ID: <4D0EF3A4.7000303@cn.fujitsu.com>
Date: Mon, 20 Dec 2010 14:11:48 +0800
From: Lai Jiangshan <laijs@cn.fujitsu.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=UTF-8
Subject: [Qemu-devel] [PATCH V4 3/3] qmp,
	nmi: convert do_inject_nmi() to QObject, QError
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Luiz Capitulino <lcapitulino@redhat.com>, Markus Armbruster <armbru@redhat.com>, qemu-devel@nongnu.org, aliguori@us.ibm.com, kvm@vger.kernel.org, Avi Kivity <avi@redhat.com>

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>
---
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",