[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V5 2/4] nmi: make cpu-index argument optional
From: |
Lai Jiangshan |
Subject: |
[Qemu-devel] [PATCH V5 2/4] nmi: make cpu-index argument optional |
Date: |
Mon, 10 Jan 2011 17:27:51 +0800 |
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 |
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 <address@hidden>
---
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);
- [Qemu-devel] [PATCH V5 2/4] nmi: make cpu-index argument optional,
Lai Jiangshan <=