Skip to contentSkip to conversation

nmi: make cpu-index argument optional

PATCH Superseded Lai Jiangshan 2 participants 2 messages Jan 10, 2011 – Jan 19, 2011 KVM

v5 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v5 2/4 nmi: make cpu-index argument optional

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.

---

hmp-commands.hx +3 -3
index 99b96a8..a49fcd4 100644
@@ -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
monitor.c +8 -1
index fd18887..952f67f 100644
@@ -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);
#1 lore raw

Sorry for the long delay on this one, in general looks good, I have just a few small comments.

Quoted 2 lines · On Mon, 10 Jan 2011 17:27:51 +0800 Lai Jiangshan <[email protected]> wrote:

When the argument "cpu-index" is not given,
then "nmi" command will inject NMI on all CPUs.

Please, state that we're changing the human monitor behavior on this.

Quoted 12 lines

This simulate the nmi button on physical machine.

Thanks to Markus Armbruster for correcting the logic detecting "cpu-index" is given or not.

---

hmp-commands.hx +0 -0
index 99b96a8..a49fcd4 100644

hmp-commands.hx ETEXI · line 726

Quoted 9 lines
hmp-commands.hx +3 -3
@@ -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",

IMO, it's better to be a bit more clear, something like: "Inject an NMI on all CPUs if no argument is given, otherwise inject it on the specified CPU".

Quoted 8 lines
hmp-commands.hx +0 -0
         .mhandler.cmd = do_inject_nmi,
     },
 #endif
monitor.c +0 -0
index fd18887..952f67f 100644

monitor.c static void do_wav_capture(Monitor *mon, const QDict *qdict) · line 2525

Quoted 7 lines
monitor.c +2 -1
@@ -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")) {

Please, use qdict_haskey().

Quoted 10 lines
monitor.c +6 -0
+        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);