From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=55619 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PcEGX-0004RQ-Vc
	for qemu-devel@nongnu.org; Mon, 10 Jan 2011 04:42:19 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <laijs@cn.fujitsu.com>) id 1PcEGV-0000uC-UH
	for qemu-devel@nongnu.org; Mon, 10 Jan 2011 04:42:17 -0500
Received: from [222.73.24.84] (port=59722 helo=song.cn.fujitsu.com)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <laijs@cn.fujitsu.com>) id 1PcEGV-0000sr-Hq
	for qemu-devel@nongnu.org; Mon, 10 Jan 2011 04:42:15 -0500
Message-ID: <4D2AD117.60204@cn.fujitsu.com>
Date: Mon, 10 Jan 2011 17:27:51 +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 V5 2/4] nmi: make cpu-index argument optional
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>

When the argument "cpu-index" is not given,
then "nmi" command will inject NMI on all CPUs.

This simulate the nmi button on physical machine.

Thanks to Markus Armbruster for correcting the logic
detecting "cpu-index" is given or not.

Signed-off-by:  Lai Jiangshan <laijs@cn.fujitsu.com>
---
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 99b96a8..a49fcd4 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -721,9 +721,9 @@ ETEXI
 #if defined(TARGET_I386)
     {
         .name       = "nmi",
-        .args_type  = "cpu-index:i",
-        .params     = "cpu",
-        .help       = "inject an NMI on the given CPU",
+        .args_type  = "cpu-index:i?",
+        .params     = "[cpu]",
+        .help       = "inject an NMI on all CPUs or the given CPU",
         .mhandler.cmd = do_inject_nmi,
     },
 #endif
diff --git a/monitor.c b/monitor.c
index fd18887..952f67f 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2520,8 +2520,15 @@ static void do_wav_capture(Monitor *mon, const QDict *qdict)
 static void do_inject_nmi(Monitor *mon, const QDict *qdict)
 {
     CPUState *env;
-    int cpu_index = qdict_get_int(qdict, "cpu-index");
+    int cpu_index;
 
+    if (!qdict_get(qdict, "cpu-index")) {
+        for (env = first_cpu; env != NULL; env = env->next_cpu)
+            cpu_interrupt(env, CPU_INTERRUPT_NMI);
+        return;
+    }
+
+    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);