From patchwork Thu Apr 28 03:35:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lai Jiangshan X-Patchwork-Id: 93172 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 09914B6EF2 for ; Thu, 28 Apr 2011 13:33:22 +1000 (EST) Received: from localhost ([::1]:34744 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFHyd-0004sc-Ve for incoming@patchwork.ozlabs.org; Wed, 27 Apr 2011 23:33:15 -0400 Received: from eggs.gnu.org ([140.186.70.92]:44015) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFHyH-0004oW-5A for qemu-devel@nongnu.org; Wed, 27 Apr 2011 23:32:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QFHyG-0000ts-46 for qemu-devel@nongnu.org; Wed, 27 Apr 2011 23:32:53 -0400 Received: from [222.73.24.84] (port=56596 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFHyF-0000tm-Ki for qemu-devel@nongnu.org; Wed, 27 Apr 2011 23:32:52 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 6C99B17012C; Thu, 28 Apr 2011 11:32:50 +0800 (CST) Received: from mailserver.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id p3S3WmAv026784; Thu, 28 Apr 2011 11:32:49 +0800 Received: from lai.fc14.fnst ([10.167.225.146]) by mailserver.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.1FP4) with ESMTP id 2011042811331622-168543 ; Thu, 28 Apr 2011 11:33:16 +0800 Message-ID: <4DB8E085.6000202@cn.fujitsu.com> Date: Thu, 28 Apr 2011 11:35:33 +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 References: <4D74A8C9.2020408@cn.fujitsu.com> <4D74A974.6090509@cn.fujitsu.com> <20110404105949.GA30324@redhat.com> <4D99BF99.1040305@redhat.com> <4D99C22C.4070401@codemonkey.ws> <20110406144723.45333682@doriath> <4D9CAAF9.7000509@codemonkey.ws> <20110406150818.56707b9b@doriath> <4DAE7AF4.3050508@cn.fujitsu.com> <4DAFA34A.3030701@cn.fujitsu.com> <20110426102641.71a60d81@doriath> <4DB6C8CB.7030706@codemonkey.ws> <4DB7775A.1010608@cn.fujitsu.com> <20110427113346.5bd7fcac@doriath> In-Reply-To: <20110427113346.5bd7fcac@doriath> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-04-28 11:33:16, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-04-28 11:33:17, Serialize complete at 2011-04-28 11:33:17 X-detected-operating-system: by eggs.gnu.org: FreeBSD 6.x (1) X-Received-From: 222.73.24.84 Cc: Lai Jiangshan , kvm@vger.kernel.org, Markus Armbruster , qemu-devel@nongnu.org, Avi Kivity Subject: [Qemu-devel] [PATCH 2/2 V9] qmp, inject-nmi: convert do_inject_nmi() to QObject X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Make we can inject NMI via qemu-monitor-protocol. We use "inject-nmi" for the command name, the meaning is clearer. The behavior is cheanged to "injecting NMI to all CPU" which simulates the Real hardware NMI button. The command "inject-nmi" is only supported for x86 guest currently, it will returns "Unsupported" error for non-x86 guest. This error and this behavior are described in the comments. Signed-off-by: Lai Jiangshan --- hmp-commands.hx | 21 +++++++++++---------- monitor.c | 20 +++++++++++++------- qmp-commands.hx | 29 +++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 17 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index 834e6a8..b511850 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -737,19 +737,20 @@ The values that can be specified here depend on the machine type, but are the same that can be specified in the @code{-boot} command line option. ETEXI -#if defined(TARGET_I386) { - .name = "nmi", - .args_type = "cpu_index:i", - .params = "cpu", - .help = "inject an NMI on the given CPU", - .mhandler.cmd = do_inject_nmi, + .name = "inject-nmi", + .args_type = "", + .params = "", + .help = "Inject an NMI on guest.\n" + "Returns \"Unsupported\" error when the guest does" + "not support NMI injection", + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_inject_nmi, }, -#endif STEXI -@item nmi @var{cpu} -@findex nmi -Inject an NMI on the given CPU (x86 only). +@item inject-nmi +@findex inject-nmi +Inject an NMI on the guest (x86 only). ETEXI { diff --git a/monitor.c b/monitor.c index 5f3bc72..129eed1 100644 --- a/monitor.c +++ b/monitor.c @@ -2544,16 +2544,22 @@ 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"); - for (env = first_cpu; env != NULL; env = env->next_cpu) - if (env->cpu_index == cpu_index) { - cpu_interrupt(env, CPU_INTERRUPT_NMI); - break; - } + for (env = first_cpu; env != NULL; env = env->next_cpu) { + cpu_interrupt(env, CPU_INTERRUPT_NMI); + } + + return 0; +} +#else +static int do_inject_nmi(Monitor *mon, const QDict *qdict, QObject **ret_data) +{ + qerror_report(QERR_UNSUPPORTED, + "Injecting NMI is unsupported for the non-x86 guest"); + return -1; } #endif diff --git a/qmp-commands.hx b/qmp-commands.hx index fbd98ee..e1b9b40 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -430,6 +430,35 @@ Example: EQMP { + .name = "inject-nmi", + .args_type = "", + .params = "", + .help = "Inject an NMI on guest.\n" + "Returns \"Unsupported\" error when the guest does" + "not support NMI injection", + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_inject_nmi, + }, + +SQMP +inject-nmi +---------- + +Inject an NMI on guest. + +Arguments: None. + +Example: + +-> { "execute": "inject-nmi" } +<- { "return": {} } + +Note: inject-nmi is only supported for x86 guest currently, it will + returns "Unsupported" error for non-x86 guest. + +EQMP + + { .name = "migrate", .args_type = "detach:-d,blk:-b,inc:-i,uri:s", .params = "[-d] [-b] [-i] uri",