* [Qemu-devel] [PATCH V5 3/4] qmp, nmi: convert do_inject_nmi() to QObject
@ 2011-01-10 9:28 Lai Jiangshan
2011-01-19 13:31 ` [Qemu-devel] " Luiz Capitulino
0 siblings, 1 reply; 2+ messages in thread
From: Lai Jiangshan @ 2011-01-10 9:28 UTC (permalink / raw)
To: Luiz Capitulino, Markus Armbruster, qemu-devel, aliguori, kvm,
Avi Kivity
Make we can inject NMI via qemu-monitor-protocol.
We use "inject-nmi" for the qmp command name, the meaning is clearer.
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
---
diff --git a/hmp-commands.hx b/hmp-commands.hx
index a49fcd4..4db413d 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -724,7 +724,8 @@ ETEXI
.args_type = "cpu-index:i?",
.params = "[cpu]",
.help = "inject an NMI on all CPUs or the given CPU",
- .mhandler.cmd = do_inject_nmi,
+ .user_print = monitor_user_noop,
+ .mhandler.cmd_new = do_inject_nmi,
},
#endif
STEXI
diff --git a/monitor.c b/monitor.c
index 952f67f..1bee840 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2517,7 +2517,7 @@ static void do_wav_capture(Monitor *mon, const QDict *qdict)
#endif
#if defined(TARGET_I386)
-static void do_inject_nmi(Monitor *mon, const QDict *qdict)
+static int do_inject_nmi(Monitor *mon, const QDict *qdict, QObject **ret_data)
{
CPUState *env;
int cpu_index;
@@ -2525,15 +2525,17 @@ static void do_inject_nmi(Monitor *mon, const QDict *qdict)
if (!qdict_get(qdict, "cpu-index")) {
for (env = first_cpu; env != NULL; env = env->next_cpu)
cpu_interrupt(env, CPU_INTERRUPT_NMI);
- return;
+ return 0;
}
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);
- break;
+ return 0;
}
+
+ return -1;
}
#endif
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 56c4d8b..c2d619c 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -429,6 +429,33 @@ Example:
EQMP
+#if defined(TARGET_I386)
+ {
+ .name = "inject_nmi",
+ .args_type = "cpu-index:i?",
+ .params = "[cpu]",
+ .help = "inject an NMI on all CPUs or the given CPU",
+ .user_print = monitor_user_noop,
+ .mhandler.cmd_new = do_inject_nmi,
+ },
+#endif
+SQMP
+inject_nmi
+----------
+
+Inject an NMI on the given CPU (x86 only).
+
+Arguments:
+
+- "cpu_index": the index of the CPU to be injected NMI (json-int)
+
+Example:
+
+-> { "execute": "inject_nmi", "arguments": { "cpu-index": 0 } }
+<- { "return": {} }
+
+EQMP
+
{
.name = "migrate",
.args_type = "detach:-d,blk:-b,inc:-i,uri:s",
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Qemu-devel] Re: [PATCH V5 3/4] qmp, nmi: convert do_inject_nmi() to QObject
2011-01-10 9:28 [Qemu-devel] [PATCH V5 3/4] qmp, nmi: convert do_inject_nmi() to QObject Lai Jiangshan
@ 2011-01-19 13:31 ` Luiz Capitulino
0 siblings, 0 replies; 2+ messages in thread
From: Luiz Capitulino @ 2011-01-19 13:31 UTC (permalink / raw)
To: Lai Jiangshan; +Cc: aliguori, Avi Kivity, Markus Armbruster, kvm, qemu-devel
On Mon, 10 Jan 2011 17:28:14 +0800
Lai Jiangshan <laijs@cn.fujitsu.com> wrote:
> Make we can inject NMI via qemu-monitor-protocol.
> We use "inject-nmi" for the qmp command name, the meaning is clearer.
>
> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
> ---
> diff --git a/hmp-commands.hx b/hmp-commands.hx
> index a49fcd4..4db413d 100644
> --- a/hmp-commands.hx
> +++ b/hmp-commands.hx
> @@ -724,7 +724,8 @@ ETEXI
> .args_type = "cpu-index:i?",
> .params = "[cpu]",
> .help = "inject an NMI on all CPUs or the given CPU",
> - .mhandler.cmd = do_inject_nmi,
> + .user_print = monitor_user_noop,
> + .mhandler.cmd_new = do_inject_nmi,
> },
> #endif
> STEXI
> diff --git a/monitor.c b/monitor.c
> index 952f67f..1bee840 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -2517,7 +2517,7 @@ static void do_wav_capture(Monitor *mon, const QDict *qdict)
> #endif
>
> #if defined(TARGET_I386)
> -static void do_inject_nmi(Monitor *mon, const QDict *qdict)
> +static int do_inject_nmi(Monitor *mon, const QDict *qdict, QObject **ret_data)
> {
> CPUState *env;
> int cpu_index;
> @@ -2525,15 +2525,17 @@ static void do_inject_nmi(Monitor *mon, const QDict *qdict)
> if (!qdict_get(qdict, "cpu-index")) {
> for (env = first_cpu; env != NULL; env = env->next_cpu)
> cpu_interrupt(env, CPU_INTERRUPT_NMI);
> - return;
> + return 0;
> }
>
> 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);
> - break;
> + return 0;
> }
> +
> + return -1;
> }
> #endif
>
> diff --git a/qmp-commands.hx b/qmp-commands.hx
> index 56c4d8b..c2d619c 100644
> --- a/qmp-commands.hx
> +++ b/qmp-commands.hx
> @@ -429,6 +429,33 @@ Example:
>
> EQMP
>
> +#if defined(TARGET_I386)
> + {
> + .name = "inject_nmi",
Please use an hyphen.
> + .args_type = "cpu-index:i?",
> + .params = "[cpu]",
> + .help = "inject an NMI on all CPUs or the given CPU",
> + .user_print = monitor_user_noop,
> + .mhandler.cmd_new = do_inject_nmi,
> + },
> +#endif
> +SQMP
> +inject_nmi
> +----------
> +
> +Inject an NMI on the given CPU (x86 only).
Please, explain that we can also inject on all CPUs.
> +
> +Arguments:
> +
> +- "cpu_index": the index of the CPU to be injected NMI (json-int)
It's actually "cpu-index", and you should write "(json-int, optional)".
> +
> +Example:
> +
> +-> { "execute": "inject_nmi", "arguments": { "cpu-index": 0 } }
Hyphen.
> +<- { "return": {} }
> +
> +EQMP
> +
> {
> .name = "migrate",
> .args_type = "detach:-d,blk:-b,inc:-i,uri:s",
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-01-19 13:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-10 9:28 [Qemu-devel] [PATCH V5 3/4] qmp, nmi: convert do_inject_nmi() to QObject Lai Jiangshan
2011-01-19 13:31 ` [Qemu-devel] " Luiz Capitulino
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).