From: Lai Jiangshan <laijs@cn.fujitsu.com>
To: Luiz Capitulino <lcapitulino@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
qemu-devel@nongnu.org, aliguori@us.ibm.com, kvm@vger.kernel.org,
Avi Kivity <avi@redhat.com>,
Lai Jian
Subject: [PATCH V6 2/4 resend] nmi: make cpu-index argument optional
Date: Mon, 14 Feb 2011 18:09:19 +0800 [thread overview]
Message-ID: <4D58FF4F.5090906@cn.fujitsu.com> (raw)
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 <laijs@cn.fujitsu.com>
---
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())
reply other threads:[~2011-02-14 10:08 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D58FF4F.5090906@cn.fujitsu.com \
--to=laijs@cn.fujitsu.com \
--cc=aliguori@us.ibm.com \
--cc=armbru@redhat.com \
--cc=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=lcapitulino@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox