From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lai Jiangshan Subject: [PATCH V6 1/4] nmi: convert cpu_index to cpu-index Date: Thu, 27 Jan 2011 16:20:27 +0800 Message-ID: <4D412ACB.3050101@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit To: Luiz Capitulino , Markus Armbruster , qemu-devel@nongnu.org, aliguori@us.ibm.com, kvm@vger.kernel.org, Avi Kivity , Lai Jian Return-path: Received: from cn.fujitsu.com ([222.73.24.84]:56750 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1750934Ab1A0IUX (ORCPT ); Thu, 27 Jan 2011 03:20:23 -0500 Sender: kvm-owner@vger.kernel.org List-ID: "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) {