From patchwork Mon Aug 3 16:57:10 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 30666 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 EFC89B6F2B for ; Tue, 4 Aug 2009 05:44:32 +1000 (EST) Received: from localhost ([127.0.0.1]:48365 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MY3SN-0007li-9A for incoming@patchwork.ozlabs.org; Mon, 03 Aug 2009 15:44:27 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MY0s5-0006CM-1K for qemu-devel@nongnu.org; Mon, 03 Aug 2009 12:58:49 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MY0rz-00069P-U2 for qemu-devel@nongnu.org; Mon, 03 Aug 2009 12:58:48 -0400 Received: from [199.232.76.173] (port=55284 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MY0rz-00069H-Je for qemu-devel@nongnu.org; Mon, 03 Aug 2009 12:58:43 -0400 Received: from mx2.redhat.com ([66.187.237.31]:56346) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MY0ry-0003BS-Sh for qemu-devel@nongnu.org; Mon, 03 Aug 2009 12:58:43 -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 n73GwgHo026329; Mon, 3 Aug 2009 12:58:42 -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 n73GwfoJ015422; Mon, 3 Aug 2009 12:58:41 -0400 Received: from localhost (vpn-10-1.bos.redhat.com [10.16.10.1]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n73GwdxA030129; Mon, 3 Aug 2009 12:58:40 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Mon, 3 Aug 2009 13:57:10 -0300 Message-Id: <1249318642-19324-14-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1249318642-19324-1-git-send-email-lcapitulino@redhat.com> References: <1249318642-19324-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: jan.kiszka@siemens.com, aliguori@us.ibm.com, avi@redhat.com Subject: [Qemu-devel] [PATCH 13/25] monitor: Port handler_4 to use the dictionary 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 four arguments to use the new monitor's dictionary. Signed-off-by: Luiz Capitulino --- monitor.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/monitor.c b/monitor.c index a3fdd5b..cbfe284 100644 --- a/monitor.c +++ b/monitor.c @@ -867,10 +867,13 @@ static void do_print(Monitor *mon, int count, int format, int size, monitor_printf(mon, "\n"); } -static void do_memory_save(Monitor *mon, unsigned int valh, unsigned int vall, - uint32_t size, const char *filename) +static void do_memory_save(Monitor *mon, const QDict *qdict) { FILE *f; + unsigned int valh = (long) qdict_get(qdict, "val_h"); + unsigned int vall = (long) qdict_get(qdict, "val_l"); + uint32_t size = (long) qdict_get(qdict, "size"); + const char *filename = qdict_get(qdict, "filename"); target_long addr = GET_TLONG(valh, vall); uint32_t l; CPUState *env; @@ -897,13 +900,15 @@ static void do_memory_save(Monitor *mon, unsigned int valh, unsigned int vall, fclose(f); } -static void do_physical_memory_save(Monitor *mon, unsigned int valh, - unsigned int vall, uint32_t size, - const char *filename) +static void do_physical_memory_save(Monitor *mon, const QDict *qdict) { FILE *f; uint32_t l; uint8_t buf[1024]; + unsigned int valh = (long) qdict_get(qdict, "val_h"); + unsigned int vall = (long) qdict_get(qdict, "val_l"); + uint32_t size = (long) qdict_get(qdict, "size"); + const char *filename = qdict_get(qdict, "filename"); target_phys_addr_t addr = GET_TPHYSADDR(valh, vall); f = fopen(filename, "wb"); @@ -2670,8 +2675,6 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) void *args[MAX_ARGS]; QDict *qdict; void (*handler_d)(Monitor *mon, const QDict *qdict); - void (*handler_4)(Monitor *mon, void *arg0, void *arg1, void *arg2, - void *arg3); void (*handler_5)(Monitor *mon, void *arg0, void *arg1, void *arg2, void *arg3, void *arg4); void (*handler_6)(Monitor *mon, void *arg0, void *arg1, void *arg2, @@ -2971,13 +2974,10 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) case 1: case 2: case 3: + case 4: handler_d = cmd->handler; handler_d(mon, qdict); break; - case 4: - handler_4 = cmd->handler; - handler_4(mon, args[0], args[1], args[2], args[3]); - break; case 5: handler_5 = cmd->handler; handler_5(mon, args[0], args[1], args[2], args[3], args[4]);