From: Lai Jiangshan <laijs@cn.fujitsu.com>
To: Luiz Capitulino <lcapitulino@redhat.com>,
qemu-devel@nongnu.org, kvm@vger.kernel.org
Subject: [PATCH 2/6] qemu,qmp: convert do_inject_nmi() to QObject
Date: Thu, 09 Dec 2010 14:59:00 +0800 [thread overview]
Message-ID: <4D007E34.8020103@cn.fujitsu.com> (raw)
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>
---
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",
next reply other threads:[~2010-12-09 6:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-09 6:59 Lai Jiangshan [this message]
2010-12-09 18:49 ` [PATCH 2/6] qemu,qmp: convert do_inject_nmi() to QObject Luiz Capitulino
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D007E34.8020103@cn.fujitsu.com \
--to=laijs@cn.fujitsu.com \
--cc=kvm@vger.kernel.org \
--cc=lcapitulino@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox