From patchwork Mon Dec 5 20:00:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 129411 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 A49C91007D4 for ; Tue, 6 Dec 2011 07:05:15 +1100 (EST) Received: from localhost ([::1]:39542 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXej4-0004Gf-TO for incoming@patchwork.ozlabs.org; Mon, 05 Dec 2011 15:01:22 -0500 Received: from eggs.gnu.org ([140.186.70.92]:41705) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXeiW-0002Xu-2Z for qemu-devel@nongnu.org; Mon, 05 Dec 2011 15:00:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RXeiU-0005zh-T6 for qemu-devel@nongnu.org; Mon, 05 Dec 2011 15:00:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:10937) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RXeiU-0005zW-MO for qemu-devel@nongnu.org; Mon, 05 Dec 2011 15:00:46 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id pB5K0ijN006810 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 5 Dec 2011 15:00:44 -0500 Received: from localhost (ovpn-113-50.phx2.redhat.com [10.3.113.50]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id pB5K0hOi018764; Mon, 5 Dec 2011 15:00:44 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Mon, 5 Dec 2011 18:00:17 -0200 Message-Id: <1323115226-16817-8-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1323115226-16817-1-git-send-email-lcapitulino@redhat.com> References: <1323115226-16817-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com, mdroth@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 07/16] qapi: Convert inject-nmi 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 Signed-off-by: Luiz Capitulino --- cpus.c | 13 +++++++++++++ hmp-commands.hx | 3 +-- hmp.c | 8 ++++++++ hmp.h | 1 + monitor.c | 19 ------------------- qapi-schema.json | 13 +++++++++++++ qmp-commands.hx | 5 +---- 7 files changed, 37 insertions(+), 25 deletions(-) diff --git a/cpus.c b/cpus.c index e916137..7b9f8eb 100644 --- a/cpus.c +++ b/cpus.c @@ -1213,3 +1213,16 @@ void qmp_pmemsave(int64_t addr, int64_t size, const char *filename, exit: fclose(f); } + +void qmp_inject_nmi(Error **errp) +{ +#if defined(TARGET_I386) + CPUState *env; + + for (env = first_cpu; env != NULL; env = env->next_cpu) { + cpu_interrupt(env, CPU_INTERRUPT_NMI); + } +#else + error_set(errp, QERR_UNSUPPORTED); +#endif +} diff --git a/hmp-commands.hx b/hmp-commands.hx index 9503751..b82aff8 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -736,8 +736,7 @@ ETEXI .args_type = "", .params = "", .help = "inject an NMI on all guest's CPUs", - .user_print = monitor_user_noop, - .mhandler.cmd_new = do_inject_nmi, + .mhandler.cmd = hmp_inject_nmi, }, #endif STEXI diff --git a/hmp.c b/hmp.c index d623526..0ebc398 100644 --- a/hmp.c +++ b/hmp.c @@ -593,3 +593,11 @@ void hmp_cont(Monitor *mon, const QDict *qdict) hmp_handle_error(mon, &errp); } } + +void hmp_inject_nmi(Monitor *mon, const QDict *qdict) +{ + Error *errp = NULL; + + qmp_inject_nmi(&errp); + hmp_handle_error(mon, &errp); +} diff --git a/hmp.h b/hmp.h index b034704..8a31f87 100644 --- a/hmp.h +++ b/hmp.h @@ -40,5 +40,6 @@ void hmp_cpu(Monitor *mon, const QDict *qdict); void hmp_memsave(Monitor *mon, const QDict *qdict); void hmp_pmemsave(Monitor *mon, const QDict *qdict); void hmp_cont(Monitor *mon, const QDict *qdict); +void hmp_inject_nmi(Monitor *mon, const QDict *qdict); #endif diff --git a/monitor.c b/monitor.c index b0d1862..62b1747 100644 --- a/monitor.c +++ b/monitor.c @@ -2204,25 +2204,6 @@ static void do_wav_capture(Monitor *mon, const QDict *qdict) } #endif -#if defined(TARGET_I386) -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 qemu_acl *find_acl(Monitor *mon, const char *name) { qemu_acl *acl = qemu_acl_find(name); diff --git a/qapi-schema.json b/qapi-schema.json index b6fd3f1..fea513f 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -966,3 +966,16 @@ ## { 'command': 'cont' } +## +# @inject-nmi: +# +# Injects an Non-Maskable Interrupt into all guest's VCPUs. +# +# Returns: If successful, nothing +# If the Virtual Machine doesn't support NMI injection, Unsupported +# +# Since: 0.14.0 +# +# Notes: Only x86 Virtual Machines support this command. +## +{ 'command': 'inject-nmi' } diff --git a/qmp-commands.hx b/qmp-commands.hx index 03b2617..2e76708 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -407,10 +407,7 @@ EQMP { .name = "inject-nmi", .args_type = "", - .params = "", - .help = "", - .user_print = monitor_user_noop, - .mhandler.cmd_new = do_inject_nmi, + .mhandler.cmd_new = qmp_marshal_input_inject_nmi, }, SQMP