From patchwork Thu Jan 27 08:20:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lai Jiangshan X-Patchwork-Id: 510421 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0R8KfGP005799 for ; Thu, 27 Jan 2011 08:20:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751615Ab1A0IUc (ORCPT ); Thu, 27 Jan 2011 03:20:32 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:56072 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1750952Ab1A0IUb (ORCPT ); Thu, 27 Jan 2011 03:20:31 -0500 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id DD9DC170044; Thu, 27 Jan 2011 16:20:26 +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 p0R8F101031010; Thu, 27 Jan 2011 16:15:01 +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 2011012716194604-37003 ; Thu, 27 Jan 2011 16:19:46 +0800 Message-ID: <4D412ACF.3080105@cn.fujitsu.com> Date: Thu, 27 Jan 2011 16:20:31 +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 Subject: [PATCH V6 2/4] nmi: make cpu-index argument optional X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-01-27 16:19:46, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-01-27 16:19:49, Serialize complete at 2011-01-27 16:19:49 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 27 Jan 2011 08:20:42 +0000 (UTC) diff --git a/hmp-commands.hx b/hmp-commands.hx index e43ac7c..ec1a4db 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -721,9 +721,10 @@ 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 if no argument is given, " + "otherwise inject it on the specified CPU", .mhandler.cmd = do_inject_nmi, }, #endif diff --git a/monitor.c b/monitor.c index a916771..387b020 100644 --- a/monitor.c +++ b/monitor.c @@ -2545,8 +2545,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_haskey(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) { if (kvm_enabled())