From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=46757 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PSuzx-0000nu-St for qemu-devel@nongnu.org; Wed, 15 Dec 2010 12:18:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PSuzw-0004SL-Ud for qemu-devel@nongnu.org; Wed, 15 Dec 2010 12:18:41 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43567) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PSuzw-0004S6-MA for qemu-devel@nongnu.org; Wed, 15 Dec 2010 12:18:40 -0500 Message-ID: <4D08F868.5090100@redhat.com> Date: Wed, 15 Dec 2010 19:18:32 +0200 From: Avi Kivity MIME-Version: 1.0 References: <4D088F27.8000909@cn.fujitsu.com> <20101215150911.14e1693f@doriath> In-Reply-To: <20101215150911.14e1693f@doriath> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [PATCH v3] qemu, qmp: convert do_inject_nmi() to QObject, QError List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Luiz Capitulino Cc: Markus Armbruster , aliguori@us.ibm.com, Lai Jiangshan , kvm@vger.kernel.org, qemu-devel@nongnu.org On 12/15/2010 07:09 PM, Luiz Capitulino wrote: > On Wed, 15 Dec 2010 17:49:27 +0800 > Lai Jiangshan wrote: > > > > > Convert do_inject_nmi() to QObject, QError, we need to use it(via libvirt). > > > > changed from v1 > > Add document. > > Add error handling when the cpu index is invalid. > > > > changed from v2 > > use QERR_INVALID_PARAMETER_VALUE as Markus suggest. > > > > Signed-off-by: Lai Jiangshan > > --- > > diff --git a/hmp-commands.hx b/hmp-commands.hx > > index 23024ba..f86d9fe 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 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 ec31eac..3e33a96 100644 > > --- a/monitor.c > > +++ b/monitor.c > > @@ -2119,7 +2119,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_int(qdict, "cpu_index"); > > @@ -2127,8 +2127,12 @@ static void do_inject_nmi(Monitor *mon, const QDict *qdict) > > 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 e5f157f..fcb6bf2 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 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) > > Please, use cpu-index, that's what we're using for the human-monitor-command. > > Avi, Anthony, can you please ACK this new command? > I'd like to see cpu-index made optional; if not present, nmi all cpus (that's what the nmi button on many machines does, or at least I think that's what it does). -- error compiling committee.c: too many arguments to function