[Qemu-devel] [PATCH 13/25] monitor: Port handler_4 to use the dictionary

[Luiz Capitulino <lcapitulino@redhat.com>]

This commit ports command handlers that receive four arguments to use
the new monitor's dictionary.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 monitor.c |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/monitor.c b/monitor.c
index 07fc14a..f9ab788 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 struct qemu_dict *qdict)
 {
     FILE *f;
+    unsigned int valh = (long) qemu_dict_get(qdict, "val_h");
+    unsigned int vall = (long) qemu_dict_get(qdict, "val_l");
+    uint32_t size = (long) qemu_dict_get(qdict, "size");
+    const char *filename = qemu_dict_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 struct qemu_dict *qdict)
 {
     FILE *f;
     uint32_t l;
     uint8_t buf[1024];
+    unsigned int valh = (long) qemu_dict_get(qdict, "val_h");
+    unsigned int vall = (long) qemu_dict_get(qdict, "val_l");
+    uint32_t size = (long) qemu_dict_get(qdict, "size");
+    const char *filename = qemu_dict_get(qdict, "filename");
     target_phys_addr_t addr = GET_TPHYSADDR(valh, vall); 
 
     f = fopen(filename, "wb");
@@ -2668,8 +2673,6 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline)
     void *args[MAX_ARGS];
     struct qemu_dict *qdict;
     void (*handler_d)(Monitor *mon, const struct qemu_dict *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,
@@ -2969,13 +2972,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