Skip to contentSkip to conversation

nmi: convert cpu_index to cpu-index

PATCH Superseded Lai Jiangshan 2 participants 5 messages Jan 27, 2011 – Feb 14, 2011 KVM

lore
Share & tools
lore

Lai Jiangshan

author
#0 lore raw

PATCH v6 1/4 nmi: convert cpu_index to cpu-index

"cpu-index" which uses hyphen is better name.

Signed-off-by Lai Jiangshan <[email protected]>

---

hmp-commands.hx +1 -1
index 5d4cb9e..e43ac7c 100644
@@ -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,
monitor.c +1 -1
index 27883f8..a916771 100644
@@ -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) {
#1 lore raw
Quoted 3 lines · On Thu, 27 Jan 2011 16:20:27 +0800 Lai Jiangshan <[email protected]> wrote:

"cpu-index" which uses hyphen is better name.

Signed-off-by Lai Jiangshan <[email protected]>

It looks ok from a quick pass, but I can't apply it on current master, what commit HEAD did you?

Btw, please, do include the patch 0/0 with a general description about the series and a small changelog between changes.

Quoted 28 lines

---

hmp-commands.hx +1 -1
index 5d4cb9e..e43ac7c 100644
@@ -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,
monitor.c +1 -1
index 27883f8..a916771 100644
@@ -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) {
author
#2 lore raw
Quoted 9 lines · Luiz Capitulino
Quoted 3 lines · On Thu, 27 Jan 2011 16:20:27 +0800 Lai Jiangshan <[email protected]> wrote:

"cpu-index" which uses hyphen is better name.

Signed-off-by Lai Jiangshan <[email protected]>

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 <[email protected]>
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

Thank you very much.
Lai.

Quoted 34 lines

Btw, please, do include the patch 0/0 with a general description about the series and a small changelog between changes.

Quoted 28 lines

---

hmp-commands.hx +1 -1
index 5d4cb9e..e43ac7c 100644
@@ -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,
monitor.c +1 -1
index 27883f8..a916771 100644
@@ -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) {
#3 lore raw
Quoted 18 lines · On Wed, 09 Feb 2011 14:46:32 +0800 Lai Jiangshan <[email protected]> wrote:
Quoted 9 lines · Luiz Capitulino
Quoted 3 lines · On Thu, 27 Jan 2011 16:20:27 +0800 Lai Jiangshan <[email protected]> wrote:

"cpu-index" which uses hyphen is better name.

Signed-off-by Lai Jiangshan <[email protected]>

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 <[email protected]>
Date: Fri Jan 21 20:34:47 2011 -0200

Quoted 5 lines

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

Quoted 39 lines

Thank you very much.
Lai.

Quoted 34 lines

Btw, please, do include the patch 0/0 with a general description about the series and a small changelog between changes.

Quoted 28 lines

---

hmp-commands.hx +1 -1
index 5d4cb9e..e43ac7c 100644
@@ -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,
monitor.c +1 -1
index 27883f8..a916771 100644
@@ -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) {
author
#4 lore raw
Quoted 5 lines · Luiz Capitulino

You should use Anthony's tree:

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

Done, thank you for your concern and patience.

see my sent emails:
[PATCH V6 1/4 resend]
[PATCH V6 2/4 resend]
[PATCH V6 3/4 resend]
[PATCH V6 4/4 resend]

Thanks again.
Lai