Patchwork [2/6] qemu, qmp: convert do_inject_nmi() to QObject

login
register
mail settings
Submitter Lai Jiangshan
Date Dec. 9, 2010, 6:59 a.m.
Message ID <4D007E34.8020103@cn.fujitsu.com>
Download mbox | patch
Permalink /patch/74946/
State New
Headers show

Comments

Lai Jiangshan - Dec. 9, 2010, 6:59 a.m.
Convert do_inject_nmi() to QObject, we need to use it(via libvirt).

It is trivial, as it never fails, doesn't have output nor return any data.

Signed-off-by:  Lai Jiangshan <laijs@cn.fujitsu.com>
---
Luiz Capitulino - Dec. 9, 2010, 6:49 p.m.
On Thu, 09 Dec 2010 14:59:00 +0800
Lai Jiangshan <laijs@cn.fujitsu.com> wrote:

> 
> Convert do_inject_nmi() to QObject, we need to use it(via libvirt).

Patches 0/6 and 1/6 are missing.

Also, I see that you're converting two unrelated commands in the same
series. Please, split into two series.

> It is trivial, as it never fails, doesn't have output nor return any data.

It does fail: the cpu index might be invalid. Also, does this depend on
the guest ability to respond in some way?

Furthermore, it's missing documentation, please read the 'Development Process'
section from QMP's readme file:

  http://git.qemu.org/qemu.git/tree/QMP/README

A last comment is that, maybe we should call it inject-nmi or even
inject-non-maskable-interrupt.

> Signed-off-by:  Lai Jiangshan <laijs@cn.fujitsu.com>
> ---
> diff --git a/hmp-commands.hx b/hmp-commands.hx
> index 7a49b74..2e6b034 100644
> --- a/hmp-commands.hx
> +++ b/hmp-commands.hx
> @@ -725,7 +725,8 @@ ETEXI
>          .args_type  = "cpu_index:i",
>          .params     = "cpu",
>          .help       = "inject an NMI on 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 729a7cb..1f0d29e 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -2120,7 +2120,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 = qdict_get_int(qdict, "cpu_index");
> @@ -2130,6 +2130,7 @@ static void do_inject_nmi(Monitor *mon, const QDict *qdict)
>              cpu_interrupt(env, CPU_INTERRUPT_NMI);
>              break;
>          }
> +    return 0;
>  }
>  #endif
>  
> diff --git a/qmp-commands.hx b/qmp-commands.hx
> index a385b66..2506981 100644
> --- a/qmp-commands.hx
> +++ b/qmp-commands.hx
> @@ -453,6 +453,22 @@ Example:
>  
>  EQMP
>  
> +#if defined(TARGET_I386)
> +    {
> +        .name       = "nmi",
> +        .args_type  = "cpu_index:i",
> +        .params     = "cpu",
> +        .help       = "inject an NMI on the given CPU",
> +        .user_print = monitor_user_noop,
> +        .mhandler.cmd_new = do_inject_nmi,
> +    },
> +#endif
> +SQMP
> +@item nmi @var{cpu}
> +@findex nmi
> +Inject an NMI on the given CPU (x86 only).
> +EQMP
> +
>      {
>          .name       = "migrate",
>          .args_type  = "detach:-d,blk:-b,inc:-i,uri:s",
>

Patch

diff --git a/hmp-commands.hx b/hmp-commands.hx
index 7a49b74..2e6b034 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -725,7 +725,8 @@  ETEXI
         .args_type  = "cpu_index:i",
         .params     = "cpu",
         .help       = "inject an NMI on 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 729a7cb..1f0d29e 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2120,7 +2120,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 = qdict_get_int(qdict, "cpu_index");
@@ -2130,6 +2130,7 @@  static void do_inject_nmi(Monitor *mon, const QDict *qdict)
             cpu_interrupt(env, CPU_INTERRUPT_NMI);
             break;
         }
+    return 0;
 }
 #endif
 
diff --git a/qmp-commands.hx b/qmp-commands.hx
index a385b66..2506981 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -453,6 +453,22 @@  Example:
 
 EQMP
 
+#if defined(TARGET_I386)
+    {
+        .name       = "nmi",
+        .args_type  = "cpu_index:i",
+        .params     = "cpu",
+        .help       = "inject an NMI on the given CPU",
+        .user_print = monitor_user_noop,
+        .mhandler.cmd_new = do_inject_nmi,
+    },
+#endif
+SQMP
+@item nmi @var{cpu}
+@findex nmi
+Inject an NMI on the given CPU (x86 only).
+EQMP
+
     {
         .name       = "migrate",
         .args_type  = "detach:-d,blk:-b,inc:-i,uri:s",