From patchwork Mon Mar 7 09:46:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lai Jiangshan X-Patchwork-Id: 615221 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 p279j7ev028347 for ; Mon, 7 Mar 2011 09:45:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755473Ab1CGJpD (ORCPT ); Mon, 7 Mar 2011 04:45:03 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:56957 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1755007Ab1CGJpC (ORCPT ); Mon, 7 Mar 2011 04:45:02 -0500 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 7836017011F; Mon, 7 Mar 2011 17:44:57 +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 p279d2iJ020225; Mon, 7 Mar 2011 17:39:03 +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 2011030717434470-300931 ; Mon, 7 Mar 2011 17:43:44 +0800 Message-ID: <4D74A974.6090509@cn.fujitsu.com> Date: Mon, 07 Mar 2011 17:46:28 +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 CC: Markus Armbruster , Anthony Liguori , Lai Jiangshan , kvm@vger.kernel.org, qemu-devel@nongnu.org, Avi Kivity Subject: [PATCH 2/2 V7] qemu,qmp: add inject-nmi qmp command References: <4D74A8C9.2020408@cn.fujitsu.com> In-Reply-To: <4D74A8C9.2020408@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-03-07 17:43:44, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-03-07 17:43:45, Serialize complete at 2011-03-07 17:43:45 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]); Mon, 07 Mar 2011 09:45:08 +0000 (UTC) diff --git a/hmp-commands.hx b/hmp-commands.hx index 372bef4..8aea56c 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -743,7 +743,7 @@ ETEXI .args_type = "cpu_index:i", .params = "cpu", .help = "inject an NMI on the given CPU", - .mhandler.cmd = do_inject_nmi, + .mhandler.cmd = do_inject_nmi_cpu, }, #endif STEXI diff --git a/monitor.c b/monitor.c index 22ae3bb..aebcc0c 100644 --- a/monitor.c +++ b/monitor.c @@ -2555,7 +2555,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 void do_inject_nmi_cpu(Monitor *mon, const QDict *qdict) { CPUState *env; int cpu_index = qdict_get_int(qdict, "cpu_index"); @@ -2566,6 +2566,22 @@ static void do_inject_nmi(Monitor *mon, const QDict *qdict) break; } } + +static int do_inject_nmi(Monitor *mon, const QDict *qdict, QObject **ret_data) +{ + CPUState *env; + + 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); + return -1; +} #endif static void do_info_status_print(Monitor *mon, const QObject *data) diff --git a/qmp-commands.hx b/qmp-commands.hx index df40a3d..51f479e 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",