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: 80610 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0E70CB70EA for ; Thu, 27 Jan 2011 19:25:01 +1100 (EST) Received: from localhost ([127.0.0.1]:40475 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PiNA2-0006so-7f for incoming@patchwork.ozlabs.org; Thu, 27 Jan 2011 03:24:58 -0500 Received: from [140.186.70.92] (port=35777 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PiN5m-0004BK-OJ for qemu-devel@nongnu.org; Thu, 27 Jan 2011 03:20:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PiN5l-0004q3-OA for qemu-devel@nongnu.org; Thu, 27 Jan 2011 03:20:34 -0500 Received: from [222.73.24.84] (port=50001 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PiN5k-0004pJ-VK for qemu-devel@nongnu.org; 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 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 X-detected-operating-system: by eggs.gnu.org: FreeBSD 6.x (1) Cc: Subject: [Qemu-devel] [PATCH V6 3/4] qmp, nmi: convert do_inject_nmi() to QObject X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Make we can inject NMI via qemu-monitor-protocol. We use "inject-nmi" for the qmp command name, the meaning is clearer. Signed-off-by: Lai Jiangshan 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",