From patchwork Thu Dec 9 06:59:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lai Jiangshan X-Patchwork-Id: 393042 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB96u4OS016935 for ; Thu, 9 Dec 2010 06:56:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754906Ab0LIG4B (ORCPT ); Thu, 9 Dec 2010 01:56:01 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:63170 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1754849Ab0LIG4A (ORCPT ); Thu, 9 Dec 2010 01:56:00 -0500 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id D5DD9170CAE; Thu, 9 Dec 2010 14:55:58 +0800 (CST) Received: from mailserver.fnst.cn.fujitus.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id oB96pEcB006035; Thu, 9 Dec 2010 14:51:15 +0800 Received: from [10.167.225.68] ([10.167.225.68]) by mailserver.fnst.cn.fujitus.com (Lotus Domino Release 8.5.1FP4) with ESMTP id 2010120914560285-195516 ; Thu, 9 Dec 2010 14:56:02 +0800 Message-ID: <4D007E34.8020103@cn.fujitsu.com> Date: Thu, 09 Dec 2010 14:59:00 +0800 From: Lai Jiangshan User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.9) Gecko/20100423 Thunderbird/3.0.4 MIME-Version: 1.0 To: Luiz Capitulino , qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [PATCH 2/6] qemu,qmp: convert do_inject_nmi() to QObject X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2010-12-09 14:56:02, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2010-12-09 14:56:03, Serialize complete at 2010-12-09 14:56:03 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 09 Dec 2010 06:56:04 +0000 (UTC) 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",