From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Luiz Capitulino 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> Subject: [Qemu-devel] [PATCH 13/25] monitor: Port handler_4 to use the dictionary List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jan.kiszka@siemens.com, aliguori@us.ibm.com, avi@redhat.com 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]); -- 1.6.4.rc3.12.gdf73a