From mboxrd@z Thu Jan 1 00:00:00 1970 From: Markus Armbruster Subject: Re: [PATCH v2 2/2] qemu,qmp: convert do_inject_nmi() to QObject, QError Date: Fri, 10 Dec 2010 11:30:16 +0100 Message-ID: References: <4D01CA58.3010306@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Luiz Capitulino , qemu-devel@nongnu.org, kvm@vger.kernel.org To: Lai Jiangshan Return-path: Received: from mx1.redhat.com ([209.132.183.28]:1025 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753530Ab0LJKag (ORCPT ); Fri, 10 Dec 2010 05:30:36 -0500 In-Reply-To: <4D01CA58.3010306@cn.fujitsu.com> (Lai Jiangshan's message of "Fri, 10 Dec 2010 14:36:08 +0800") Sender: kvm-owner@vger.kernel.org List-ID: Lai Jiangshan writes: > 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. > > 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..f375eb3 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,11 @@ 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_CPU_INDEX, cpu_index); > + return -1; do_cpu_set() reports invalud index like this: qerror_report(QERR_INVALID_PARAMETER_VALUE, "index", "a CPU number"); What about sticking to that? [...] From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=35788 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PR0FJ-0003E9-K7 for qemu-devel@nongnu.org; Fri, 10 Dec 2010 05:30:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PR0FI-0008S1-EA for qemu-devel@nongnu.org; Fri, 10 Dec 2010 05:30:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38274) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PR0FI-0008RU-67 for qemu-devel@nongnu.org; Fri, 10 Dec 2010 05:30:36 -0500 From: Markus Armbruster References: <4D01CA58.3010306@cn.fujitsu.com> Date: Fri, 10 Dec 2010 11:30:16 +0100 In-Reply-To: <4D01CA58.3010306@cn.fujitsu.com> (Lai Jiangshan's message of "Fri, 10 Dec 2010 14:36:08 +0800") Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: [Qemu-devel] Re: [PATCH v2 2/2] 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: Lai Jiangshan Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, Luiz Capitulino Lai Jiangshan writes: > 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. > > 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..f375eb3 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,11 @@ 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_CPU_INDEX, cpu_index); > + return -1; do_cpu_set() reports invalud index like this: qerror_report(QERR_INVALID_PARAMETER_VALUE, "index", "a CPU number"); What about sticking to that? [...]