[Qemu-devel] Re: [PATCH V6 1/4] nmi: convert cpu_index to cpu-index

[Luiz Capitulino <lcapitulino@redhat.com>]

On Wed, 09 Feb 2011 14:46:32 +0800
Lai Jiangshan <laijs@cn.fujitsu.com> wrote:

> On 02/01/2011 09:29 PM, Luiz Capitulino wrote:
> > On Thu, 27 Jan 2011 16:20:27 +0800
> > Lai Jiangshan <laijs@cn.fujitsu.com> wrote:
> > 
> >> "cpu-index" which uses hyphen is better name.
> >>
> >> Signed-off-by:  Lai Jiangshan <laijs@cn.fujitsu.com>
> > 
> > It looks ok from a quick pass, but I can't apply it on current master, what
> > commit HEAD did you?
> 
> It is origin for this HEAD:
> 
> commit 6f32e3d09d990fd50008756fcb446b55e0c0af79
> Merge: f447f8c 0f46d15
> Author: Marcelo Tosatti <mtosatti@redhat.com>
> Date:   Fri Jan 21 20:34:47 2011 -0200
> 
>     Merge branch 'upstream-merge'
> 
> It can be also applied on the today's master.
> The tree I used is:
> http://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git

You should use Anthony's tree:

 git://git.qemu.org/qemu.git

> 
> Thank you very much.
> Lai.
> 
> > 
> > Btw, please, do include the patch 0/0 with a general description about the
> > series and a small changelog between changes.
> > 
> >> ---
> >> diff --git a/hmp-commands.hx b/hmp-commands.hx
> >> index 5d4cb9e..e43ac7c 100644
> >> --- a/hmp-commands.hx
> >> +++ b/hmp-commands.hx
> >> @@ -721,7 +721,7 @@ ETEXI
> >>  #if defined(TARGET_I386)
> >>      {
> >>          .name       = "nmi",
> >> -        .args_type  = "cpu_index:i",
> >> +        .args_type  = "cpu-index:i",
> >>          .params     = "cpu",
> >>          .help       = "inject an NMI on the given CPU",
> >>          .mhandler.cmd = do_inject_nmi,
> >> diff --git a/monitor.c b/monitor.c
> >> index 27883f8..a916771 100644
> >> --- a/monitor.c
> >> +++ b/monitor.c
> >> @@ -2545,7 +2545,7 @@ 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 = qdict_get_int(qdict, "cpu-index");
> >>  
> >>      for (env = first_cpu; env != NULL; env = env->next_cpu)
> >>          if (env->cpu_index == cpu_index) {
> >>
> > 
> > 
>