Sorry for the long delay on this one, in general looks good, I have just
a few small comments.
On Mon, 10 Jan 2011 17:27:51 +0800
Lai Jiangshan <laijs@xxxxxxxxxxxxxx> 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.
> 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@xxxxxxxxxxxxxx>
> ---
> 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",
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".
> .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")) {
Please, use qdict_haskey().
> + 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);
>
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
