From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=34738 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PovM6-0007tI-UP
	for qemu-devel@nongnu.org; Mon, 14 Feb 2011 05:08:34 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <laijs@cn.fujitsu.com>) id 1PovM5-0004XK-3t
	for qemu-devel@nongnu.org; Mon, 14 Feb 2011 05:08:30 -0500
Received: from [222.73.24.84] (port=49757 helo=song.cn.fujitsu.com)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <laijs@cn.fujitsu.com>) id 1PovM4-0004Vc-Lo
	for qemu-devel@nongnu.org; Mon, 14 Feb 2011 05:08:28 -0500
Message-ID: <4D58FF49.5090503@cn.fujitsu.com>
Date: Mon, 14 Feb 2011 18:09:13 +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 V6 1/4 resend] nmi: convert cpu_index to
	cpu-index
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>, Lai Jiangshan <eag0628@gmail.com>

"cpu-index" which uses hyphen is better name.

Signed-off-by:  Lai Jiangshan <laijs@cn.fujitsu.com>
---
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 5d4cb9e..e43ac7c 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -721,7 +721,7 @@ ETEXI
 #if defined(TARGET_I386)
     {
         .name       = "nmi",
-        .args_type  = "cpu_index:i",
+        .args_type  = "cpu-index:i",
         .params     = "cpu",
         .help       = "inject an NMI on the given CPU",
         .mhandler.cmd = do_inject_nmi,
diff --git a/monitor.c b/monitor.c
index 27883f8..a916771 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2545,7 +2545,7 @@ 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 = qdict_get_int(qdict, "cpu-index");
 
     for (env = first_cpu; env != NULL; env = env->next_cpu)
         if (env->cpu_index == cpu_index) {