From patchwork Thu Jan 27 08:20:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lai Jiangshan X-Patchwork-Id: 510431 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 p0R8KfGQ005799 for ; Thu, 27 Jan 2011 08:20:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751843Ab1A0IUf (ORCPT ); Thu, 27 Jan 2011 03:20:35 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:53575 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1750952Ab1A0IUd (ORCPT ); Thu, 27 Jan 2011 03:20:33 -0500 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 23D3B17008E; Thu, 27 Jan 2011 16:20:31 +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 p0R8F102031010; Thu, 27 Jan 2011 16:15:06 +0800 Received: from lai.fc14.fnst ([10.167.225.146]) by mailserver.fnst.cn.fujitus.com (Lotus Domino Release 8.5.1FP4) with ESMTP id 2011012716194836-37005 ; Thu, 27 Jan 2011 16:19:48 +0800 Message-ID: <4D412AD2.1090509@cn.fujitsu.com> Date: Thu, 27 Jan 2011 16:20:34 +0800 From: Lai Jiangshan User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.9) Gecko/20100921 Fedora/3.1.4-1.fc14 Thunderbird/3.1.4 MIME-Version: 1.0 To: Luiz Capitulino , Markus Armbruster , qemu-devel@nongnu.org, aliguori@us.ibm.com, kvm@vger.kernel.org, Avi Kivity , Lai Jiangshan Subject: [PATCH V6 3/4] qmp,nmi: convert do_inject_nmi() to QObject X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-01-27 16:19:48, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-01-27 16:19:52, Serialize complete at 2011-01-27 16:19:52 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.6 (demeter1.kernel.org [140.211.167.41]); Thu, 27 Jan 2011 08:20:42 +0000 (UTC) diff --git a/hmp-commands.hx b/hmp-commands.hx index ec1a4db..e763bf9 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -725,7 +725,8 @@ ETEXI .params = "[cpu]", .help = "Inject an NMI on all CPUs if no argument is given, " "otherwise inject it on the specified 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 387b020..1b1c0ba 100644 --- a/monitor.c +++ b/monitor.c @@ -2542,7 +2542,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; @@ -2550,7 +2550,7 @@ static void do_inject_nmi(Monitor *mon, const QDict *qdict) if (!qdict_haskey(qdict, "cpu-index")) { for (env = first_cpu; env != NULL; env = env->next_cpu) cpu_interrupt(env, CPU_INTERRUPT_NMI); - return; + return 0; } cpu_index = qdict_get_int(qdict, "cpu-index"); @@ -2560,8 +2560,10 @@ static void do_inject_nmi(Monitor *mon, const QDict *qdict) kvm_inject_interrupt(env, CPU_INTERRUPT_NMI); else cpu_interrupt(env, CPU_INTERRUPT_NMI); - break; + return 0; } + + return -1; } #endif diff --git a/qmp-commands.hx b/qmp-commands.hx index 56c4d8b..a887dd5 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -429,6 +429,34 @@ Example: EQMP +#if defined(TARGET_I386) + { + .name = "inject-nmi", + .args_type = "cpu-index:i?", + .params = "[cpu]", + .help = "Inject an NMI on all CPUs if no argument is given, " + "otherwise inject it on the specified CPU", + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_inject_nmi, + }, +#endif +SQMP +inject-nmi +---------- + +Inject an NMI on all CPUs or the given CPU (x86 only). + +Arguments: + +- "cpu-index": the index of the CPU to be injected NMI (json-int, optional) + +Example: + +-> { "execute": "inject-nmi", "arguments": { "cpu-index": 0 } } +<- { "return": {} } + +EQMP + { .name = "migrate", .args_type = "detach:-d,blk:-b,inc:-i,uri:s",