From patchwork Fri Aug 28 18:27:18 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 32419 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 70566B7B83 for ; Sat, 29 Aug 2009 05:00:40 +1000 (EST) Received: from localhost ([127.0.0.1]:41246 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mh6ge-00031M-8H for incoming@patchwork.ozlabs.org; Fri, 28 Aug 2009 15:00:36 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mh6Bf-0007io-Qt for qemu-devel@nongnu.org; Fri, 28 Aug 2009 14:28:35 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mh6Bb-0007fe-5u for qemu-devel@nongnu.org; Fri, 28 Aug 2009 14:28:35 -0400 Received: from [199.232.76.173] (port=41300 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mh6Ba-0007fW-TL for qemu-devel@nongnu.org; Fri, 28 Aug 2009 14:28:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14887) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mh6Ba-00037q-G9 for qemu-devel@nongnu.org; Fri, 28 Aug 2009 14:28:30 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7SISTgY025878; Fri, 28 Aug 2009 14:28:29 -0400 Received: from localhost (vpn-10-114.bos.redhat.com [10.16.10.114]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7SISSDu007453; Fri, 28 Aug 2009 14:28:28 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Fri, 28 Aug 2009 15:27:18 -0300 Message-Id: <1251484052-3939-16-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1251484052-3939-1-git-send-email-lcapitulino@redhat.com> References: <1251484052-3939-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: aliguori@us.ibm.com, avi@redhat.com Subject: [Qemu-devel] [PATCH 15/29] monitor: Port handler_6 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 six arguments to use the new monitor's dictionary. Signed-off-by: Luiz Capitulino --- monitor.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/monitor.c b/monitor.c index 7df7081..4947ef1 100644 --- a/monitor.c +++ b/monitor.c @@ -1198,13 +1198,16 @@ static void do_mouse_button(Monitor *mon, const QDict *qdict) kbd_mouse_event(0, 0, 0, mouse_button_state); } -static void do_ioport_read(Monitor *mon, int count, int format, int size, - int addr, int has_index, int index) +static void do_ioport_read(Monitor *mon, const QDict *qdict) { + int size = qdict_get_int(qdict, "size"); + int addr = qdict_get_int(qdict, "addr"); + int has_index = qdict_haskey(qdict, "index"); uint32_t val; int suffix; if (has_index) { + int index = qdict_get_int(qdict, "index"); cpu_outb(NULL, addr & IOPORTS_MASK, index & 0xff); addr++; } @@ -2598,8 +2601,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_6)(Monitor *mon, void *arg0, void *arg1, void *arg2, - void *arg3, void *arg4, void *arg5); void (*handler_7)(Monitor *mon, void *arg0, void *arg1, void *arg2, void *arg3, void *arg4, void *arg5, void *arg6); void (*handler_8)(Monitor *mon, void *arg0, void *arg1, void *arg2, @@ -2889,13 +2890,10 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) case 3: case 4: case 5: + case 6: handler_d = cmd->handler; handler_d(mon, qdict); break; - case 6: - handler_6 = cmd->handler; - handler_6(mon, args[0], args[1], args[2], args[3], args[4], args[5]); - break; case 7: handler_7 = cmd->handler; handler_7(mon, args[0], args[1], args[2], args[3], args[4], args[5],