All of lore.kernel.org
 help / color / mirror / Atom feed
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>
Subject: [PATCH V5 2/4] nmi: make cpu-index argument optional
Date: Mon, 10 Jan 2011 17:27:51 +0800	[thread overview]
Message-ID: <4D2AD117.60204@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.

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 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);

WARNING: multiple messages have this Message-ID (diff)
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>
Subject: [Qemu-devel] [PATCH V5 2/4] nmi: make cpu-index argument optional
Date: Mon, 10 Jan 2011 17:27:51 +0800	[thread overview]
Message-ID: <4D2AD117.60204@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.

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 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);

             reply	other threads:[~2011-01-10  9:42 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-10  9:27 Lai Jiangshan [this message]
2011-01-10  9:27 ` [Qemu-devel] [PATCH V5 2/4] nmi: make cpu-index argument optional Lai Jiangshan
2011-01-19 13:26 ` Luiz Capitulino
2011-01-19 13:26   ` [Qemu-devel] " Luiz Capitulino

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=4D2AD117.60204@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 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.