From patchwork Mon Dec 20 06:11:48 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lai Jiangshan X-Patchwork-Id: 76170 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 3AD4AB6F2B for ; Mon, 20 Dec 2010 17:27:06 +1100 (EST) Received: from localhost ([127.0.0.1]:41993 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PUZ45-0004II-1F for incoming@patchwork.ozlabs.org; Mon, 20 Dec 2010 01:17:45 -0500 Received: from [140.186.70.92] (port=54523 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PUYxC-0001k3-Dy for qemu-devel@nongnu.org; Mon, 20 Dec 2010 01:10:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PUYww-0006PS-P5 for qemu-devel@nongnu.org; Mon, 20 Dec 2010 01:10:38 -0500 Received: from [222.73.24.84] (port=53911 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PUYwv-0006Oo-Jv for qemu-devel@nongnu.org; Mon, 20 Dec 2010 01:10:22 -0500 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 24E87170D2E; Mon, 20 Dec 2010 14:10:20 +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 oBK65R1s010284; Mon, 20 Dec 2010 14:05:27 +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 2010122014101554-6044 ; Mon, 20 Dec 2010 14:10:15 +0800 Message-ID: <4D0EF3A4.7000303@cn.fujitsu.com> Date: Mon, 20 Dec 2010 14:11:48 +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 , Markus Armbruster , qemu-devel@nongnu.org, aliguori@us.ibm.com, kvm@vger.kernel.org, Avi Kivity X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2010-12-20 14:10:15, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2010-12-20 14:10:15, Serialize complete at 2010-12-20 14:10:15 X-detected-operating-system: by eggs.gnu.org: FreeBSD 6.x (1) Cc: Subject: [Qemu-devel] [PATCH V4 3/3] qmp, nmi: convert do_inject_nmi() to QObject, QError 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. When cpu-index is found invalid in runtime, it will report QERR_INVALID_PARAMETER_VALUE. Signed-off-by: Lai Jiangshan diff --git a/hmp-commands.hx b/hmp-commands.hx index d8fe4c0..f6d4c2f 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -724,7 +724,8 @@ ETEXI .args_type = "cpu-index:i?", .params = "[cpu]", .help = "inject an NMI on all CPUs or 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 45a8dc2..d90d6f5 100644 --- a/monitor.c +++ b/monitor.c @@ -2407,7 +2407,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_try_int(qdict, "cpu-index", -1); @@ -2415,14 +2415,17 @@ static void do_inject_nmi(Monitor *mon, const QDict *qdict) if (cpu_index == -1) { for (env = first_cpu; env != NULL; env = env->next_cpu) cpu_interrupt(env, CPU_INTERRUPT_NMI); - return; + return 0; } for (env = first_cpu; env != NULL; env = env->next_cpu) if (env->cpu_index == cpu_index) { cpu_interrupt(env, CPU_INTERRUPT_NMI); - break; + return 0; } + + qerror_report(QERR_INVALID_PARAMETER_VALUE, "cpu-index", "a CPU number"); + return -1; } #endif diff --git a/qmp-commands.hx b/qmp-commands.hx index 3486223..8cca5c3 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -429,6 +429,33 @@ Example: EQMP +#if defined(TARGET_I386) + { + .name = "inject_nmi", + .args_type = "cpu-index:i?", + .params = "[cpu]", + .help = "inject an NMI on all CPUs or the given CPU", + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_inject_nmi, + }, +#endif +SQMP +inject_nmi +---------- + +Inject an NMI on the given CPU (x86 only). + +Arguments: + +- "cpu_index": the index of the CPU to be injected NMI (json-int) + +Example: + +-> { "execute": "inject_nmi", "arguments": { "cpu-index": 0 } } +<- { "return": {} } + +EQMP + { .name = "migrate", .args_type = "detach:-d,blk:-b,inc:-i,uri:s",