From patchwork Mon Jan 10 09:27:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lai Jiangshan X-Patchwork-Id: 78112 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 B002AB70AF for ; Mon, 10 Jan 2011 21:09:44 +1100 (EST) Received: from localhost ([127.0.0.1]:51131 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PcEHM-0004Rf-NQ for incoming@patchwork.ozlabs.org; Mon, 10 Jan 2011 04:43:08 -0500 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 ) 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 ) id 1PcEGV-0000sr-Hq for qemu-devel@nongnu.org; Mon, 10 Jan 2011 04:42:15 -0500 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 1435D17011D; Mon, 10 Jan 2011 17:42:09 +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 p0A9axoj028668; Mon, 10 Jan 2011 17:36:59 +0800 Received: from fc14_lai.fnst ([10.167.225.146]) by mailserver.fnst.cn.fujitus.com (Lotus Domino Release 8.5.1FP4) with ESMTP id 2011011017270175-132402 ; Mon, 10 Jan 2011 17:27:01 +0800 Message-ID: <4D2AD117.60204@cn.fujitsu.com> Date: Mon, 10 Jan 2011 17:27:51 +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 X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-01-10 17:27:01, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-01-10 17:41:45, Serialize complete at 2011-01-10 17:41:45 X-detected-operating-system: by eggs.gnu.org: FreeBSD 6.x (1) Cc: Subject: [Qemu-devel] [PATCH V5 2/4] nmi: make cpu-index argument optional 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 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 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);