From patchwork Thu Aug 13 13:50:17 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 31318 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id A48F7B6EDF for ; Fri, 14 Aug 2009 00:26:10 +1000 (EST) Received: from localhost ([127.0.0.1]:33167 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MbbFn-0005E5-LA for incoming@patchwork.ozlabs.org; Thu, 13 Aug 2009 10:26:07 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MbaiZ-00010K-VX for qemu-devel@nongnu.org; Thu, 13 Aug 2009 09:51:48 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MbaiU-0000tV-C9 for qemu-devel@nongnu.org; Thu, 13 Aug 2009 09:51:46 -0400 Received: from [199.232.76.173] (port=33511 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MbaiT-0000sh-Tz for qemu-devel@nongnu.org; Thu, 13 Aug 2009 09:51:41 -0400 Received: from mx2.redhat.com ([66.187.237.31]:45124) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MbaiT-0003M5-6i for qemu-devel@nongnu.org; Thu, 13 Aug 2009 09:51:41 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7DDpeKP023383; Thu, 13 Aug 2009 09:51:40 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n7DDpcwo027423; Thu, 13 Aug 2009 09:51:39 -0400 Received: from localhost (vpn-10-83.bos.redhat.com [10.16.10.83]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n7DDpbWH012213; Thu, 13 Aug 2009 09:51:38 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Thu, 13 Aug 2009 10:50:17 -0300 Message-Id: <1250171428-29308-19-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1250171428-29308-1-git-send-email-lcapitulino@redhat.com> References: <1250171428-29308-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: aliguori@us.ibm.com, avi@redhat.com Subject: [Qemu-devel] [PATCH 18/29] monitor: Port handler_10 to use QDict X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This commit ports command handlers that receive ten arguments to use the new monitor's dictionary. Signed-off-by: Luiz Capitulino --- monitor.c | 26 ++++++++------------------ 1 files changed, 8 insertions(+), 18 deletions(-) diff --git a/monitor.c b/monitor.c index 645d9e2..675b321 100644 --- a/monitor.c +++ b/monitor.c @@ -1765,18 +1765,15 @@ static void do_acl_remove(Monitor *mon, const QDict *qdict) } #if defined(TARGET_I386) -static void do_inject_mce(Monitor *mon, - int cpu_index, int bank, - unsigned status_hi, unsigned status_lo, - unsigned mcg_status_hi, unsigned mcg_status_lo, - unsigned addr_hi, unsigned addr_lo, - unsigned misc_hi, unsigned misc_lo) +static void do_inject_mce(Monitor *mon, const QDict *qdict) { CPUState *cenv; - uint64_t status = ((uint64_t)status_hi << 32) | status_lo; - uint64_t mcg_status = ((uint64_t)mcg_status_hi << 32) | mcg_status_lo; - uint64_t addr = ((uint64_t)addr_hi << 32) | addr_lo; - uint64_t misc = ((uint64_t)misc_hi << 32) | misc_lo; + int cpu_index = qdict_get_int(qdict, "cpu_index"); + int bank = qdict_get_int(qdict, "bank"); + uint64_t status = qdict_get_uint64(qdict, "status"); + uint64_t mcg_status = qdict_get_uint64(qdict, "mcg_status"); + uint64_t addr = qdict_get_uint64(qdict, "addr"); + uint64_t misc = qdict_get_uint64(qdict, "misc"); for (cenv = first_cpu; cenv != NULL; cenv = cenv->next_cpu) if (cenv->cpu_index == cpu_index && cenv->mcg_cap) { @@ -2666,9 +2663,6 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) void *str_allocated[MAX_ARGS]; void *args[MAX_ARGS]; void (*handler_d)(Monitor *mon, const QDict *qdict); - void (*handler_10)(Monitor *mon, void *arg0, void *arg1, void *arg2, - void *arg3, void *arg4, void *arg5, void *arg6, - void *arg7, void *arg8, void *arg9); #ifdef DEBUG monitor_printf(mon, "command='%s'\n", cmdline); @@ -2948,14 +2942,10 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) case 5: case 6: case 7: + case 10: handler_d = cmd->handler; handler_d(mon, qdict); break; - case 10: - handler_10 = cmd->handler; - handler_10(mon, args[0], args[1], args[2], args[3], args[4], args[5], - args[6], args[7], args[8], args[9]); - break; default: monitor_printf(mon, "unsupported number of arguments: %d\n", nb_args); goto fail;