From patchwork Wed Aug 19 23:07:46 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 31687 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 8F441B7080 for ; Thu, 20 Aug 2009 09:34:28 +1000 (EST) Received: from localhost ([127.0.0.1]:36594 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mdufg-0002ut-7S for incoming@patchwork.ozlabs.org; Wed, 19 Aug 2009 19:34:24 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MduHS-0002Dq-3j for qemu-devel@nongnu.org; Wed, 19 Aug 2009 19:09:22 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MduHN-00026g-9K for qemu-devel@nongnu.org; Wed, 19 Aug 2009 19:09:21 -0400 Received: from [199.232.76.173] (port=49898 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MduHN-00026R-4G for qemu-devel@nongnu.org; Wed, 19 Aug 2009 19:09:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1316) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MduHM-0005XT-KF for qemu-devel@nongnu.org; Wed, 19 Aug 2009 19:09:16 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7JN9Fer020475; Wed, 19 Aug 2009 19:09:15 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7JN9EHl024205; Wed, 19 Aug 2009 19:09:14 -0400 Received: from localhost (vpn-10-5.bos.redhat.com [10.16.10.5]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n7JN9CIx031999; Wed, 19 Aug 2009 19:09:13 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 19 Aug 2009 20:07:46 -0300 Message-Id: <1250723280-3509-16-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1250723280-3509-1-git-send-email-lcapitulino@redhat.com> References: <1250723280-3509-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 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 5d68454..28d9e54 100644 --- a/monitor.c +++ b/monitor.c @@ -1201,13 +1201,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_exists(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++; } @@ -2650,8 +2653,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, @@ -2940,13 +2941,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],