From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lai Jiangshan Subject: [PATCH V6 2/4] nmi: make cpu-index argument optional Date: Thu, 27 Jan 2011 16:20:31 +0800 Message-ID: <4D412ACF.3080105@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]: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 Sender: kvm-owner@vger.kernel.org List-ID: 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. Note: it will allow non-argument "nmi" command and change the human monitor behavior. 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 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()) From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=35760 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PiN5l-0004BF-RU for qemu-devel@nongnu.org; Thu, 27 Jan 2011 03:20:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PiN5k-0004pd-No for qemu-devel@nongnu.org; Thu, 27 Jan 2011 03:20:33 -0500 Received: from [222.73.24.84] (port=50018 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PiN5k-0004nd-8o for qemu-devel@nongnu.org; Thu, 27 Jan 2011 03:20:32 -0500 Message-ID: <4D412ACF.3080105@cn.fujitsu.com> Date: Thu, 27 Jan 2011 16:20:31 +0800 From: Lai Jiangshan MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=UTF-8 Subject: [Qemu-devel] [PATCH V6 2/4] nmi: make cpu-index argument optional List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Luiz Capitulino , Markus Armbruster , qemu-devel@nongnu.org, aliguori@us.ibm.com, kvm@vger.kernel.org, Avi Kivity , Lai Jiangshan 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. Note: it will allow non-argument "nmi" command and change the human monitor behavior. 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 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())