From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=58963 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PfY42-0003w3-2x
	for qemu-devel@nongnu.org; Wed, 19 Jan 2011 08:27:07 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1PfY40-0005x0-P1
	for qemu-devel@nongnu.org; Wed, 19 Jan 2011 08:27:05 -0500
Received: from mx1.redhat.com ([209.132.183.28]:62060)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1PfY40-0005wv-IC
	for qemu-devel@nongnu.org; Wed, 19 Jan 2011 08:27:04 -0500
Date: Wed, 19 Jan 2011 11:26:53 -0200
From: Luiz Capitulino <lcapitulino@redhat.com>
Message-ID: <20110119112653.19059a0d@doriath>
In-Reply-To: <4D2AD117.60204@cn.fujitsu.com>
References: <4D2AD117.60204@cn.fujitsu.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] Re: [PATCH V5 2/4] nmi: make cpu-index argument
	optional
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: aliguori@us.ibm.com, Avi Kivity <avi@redhat.com>, Markus Armbruster <armbru@redhat.com>, kvm@vger.kernel.org, qemu-devel@nongnu.org


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@cn.fujitsu.com> 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@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",

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