From patchwork Mon Feb 14 10:09:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lai Jiangshan X-Patchwork-Id: 83055 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 40A85B7195 for ; Mon, 14 Feb 2011 21:10:01 +1100 (EST) Received: from localhost ([127.0.0.1]:36820 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PovNV-0007vj-H5 for incoming@patchwork.ozlabs.org; Mon, 14 Feb 2011 05:09:57 -0500 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 ) 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 ) id 1PovM4-0004Vc-Lo for qemu-devel@nongnu.org; Mon, 14 Feb 2011 05:08:28 -0500 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id CA8F517012C; Mon, 14 Feb 2011 18:08:19 +0800 (CST) Received: from mailserver.fnst.cn.fujitus.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id p1EA2gr1015916; Mon, 14 Feb 2011 18:02:42 +0800 Received: from lai.fc14.fnst ([10.167.225.146]) by mailserver.fnst.cn.fujitus.com (Lotus Domino Release 8.5.1FP4) with ESMTP id 2011021418072539-130801 ; Mon, 14 Feb 2011 18:07:25 +0800 Message-ID: <4D58FF49.5090503@cn.fujitsu.com> Date: Mon, 14 Feb 2011 18:09:13 +0800 From: Lai Jiangshan User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.9) Gecko/20100921 Fedora/3.1.4-1.fc14 Thunderbird/3.1.4 MIME-Version: 1.0 To: Luiz Capitulino , Markus Armbruster , qemu-devel@nongnu.org, aliguori@us.ibm.com, kvm@vger.kernel.org, Avi Kivity , Lai Jiangshan X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-02-14 18:07:25, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-02-14 18:07:25, Serialize complete at 2011-02-14 18:07:25 X-detected-operating-system: by eggs.gnu.org: FreeBSD 6.x (1) X-Received-From: 222.73.24.84 Cc: Subject: [Qemu-devel] [PATCH V6 1/4 resend] nmi: convert cpu_index to cpu-index X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org "cpu-index" which uses hyphen is better name. Signed-off-by: Lai Jiangshan 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) {