* [PATCH V6 2/4] nmi: make cpu-index argument optional
@ 2011-01-27 8:20 ` Lai Jiangshan
0 siblings, 0 replies; 2+ messages in thread
From: Lai Jiangshan @ 2011-01-27 8:20 UTC (permalink / raw)
To: Luiz Capitulino, Markus Armbruster, qemu-devel, aliguori, kvm,
Avi Kivity, Lai
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())
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Qemu-devel] [PATCH V6 2/4] nmi: make cpu-index argument optional
@ 2011-01-27 8:20 ` Lai Jiangshan
0 siblings, 0 replies; 2+ messages in thread
From: Lai Jiangshan @ 2011-01-27 8:20 UTC (permalink / raw)
To: Luiz Capitulino, Markus Armbruster, qemu-devel, aliguori, kvm,
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 <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())
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-01-27 8:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-27 8:20 [PATCH V6 2/4] nmi: make cpu-index argument optional Lai Jiangshan
2011-01-27 8:20 ` [Qemu-devel] " Lai Jiangshan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.