From patchwork Wed Aug 19 23:07:44 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 31689 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 6EDCDB707B for ; Thu, 20 Aug 2009 09:38:43 +1000 (EST) Received: from localhost ([127.0.0.1]:42179 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mdujo-00069c-I2 for incoming@patchwork.ozlabs.org; Wed, 19 Aug 2009 19:38:40 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MduHW-0002Ik-4P for qemu-devel@nongnu.org; Wed, 19 Aug 2009 19:09:26 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MduHQ-0002Bt-9K for qemu-devel@nongnu.org; Wed, 19 Aug 2009 19:09:24 -0400 Received: from [199.232.76.173] (port=49900 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MduHP-0002BJ-TX for qemu-devel@nongnu.org; Wed, 19 Aug 2009 19:09:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1025) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MduHP-0005Xp-9i for qemu-devel@nongnu.org; Wed, 19 Aug 2009 19:09:19 -0400 Received: from int-mx07.intmail.prod.int.phx2.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7JN9Hoi030435 for ; Wed, 19 Aug 2009 19:09:17 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx07.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7JN96T6022709; Wed, 19 Aug 2009 19:09:06 -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 n7JN94pu031987; Wed, 19 Aug 2009 19:09:05 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 19 Aug 2009 20:07:44 -0300 Message-Id: <1250723280-3509-14-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.20 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 13/29] monitor: Port handler_4 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 four arguments to use the new monitor's dictionary. Note that GET_TLONG() and GET_TPHYSADDR() macros are not used anymore. Signed-off-by: Luiz Capitulino --- monitor.c | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-) diff --git a/monitor.c b/monitor.c index 77fff17..983a6e1 100644 --- a/monitor.c +++ b/monitor.c @@ -859,11 +859,12 @@ 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; - target_long addr = GET_TLONG(valh, vall); + uint32_t size = qdict_get_uint32(qdict, "size"); + const char *filename = qdict_get_str(qdict, "filename"); + target_long addr = qdict_get_uint64(qdict, "val"); uint32_t l; CPUState *env; uint8_t buf[1024]; @@ -889,14 +890,14 @@ 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]; - target_phys_addr_t addr = GET_TPHYSADDR(valh, vall); + uint32_t size = qdict_get_uint32(qdict, "size"); + const char *filename = qdict_get_str(qdict, "filename"); + target_phys_addr_t addr = qdict_get_uint64(qdict, "val"); f = fopen(filename, "wb"); if (!f) { @@ -2634,8 +2635,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_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, @@ -2926,13 +2925,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]);