From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lai Jiangshan Subject: [PATCH 2/3] nmi: make cpu-index argument optional Date: Mon, 20 Dec 2010 14:11:38 +0800 Message-ID: <4D0EF39A.4030406@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 Return-path: Received: from cn.fujitsu.com ([222.73.24.84]:57502 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752657Ab0LTGKR (ORCPT ); Mon, 20 Dec 2010 01:10:17 -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. Signed-off-by: Lai Jiangshan --- diff --git a/hmp-commands.hx b/hmp-commands.hx index 8de7aa3..d8fe4c0 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 c16b39d..45a8dc2 100644 --- a/monitor.c +++ b/monitor.c @@ -2410,7 +2410,13 @@ 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_try_int(qdict, "cpu-index", -1); + + if (cpu_index == -1) { + for (env = first_cpu; env != NULL; env = env->next_cpu) + cpu_interrupt(env, CPU_INTERRUPT_NMI); + return; + } for (env = first_cpu; env != NULL; env = env->next_cpu) if (env->cpu_index == cpu_index) {