[Qemu-devel] [PATCH 09/25] monitor: Port handler_0 to use the dictionary

[Luiz Capitulino]

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

It might seem no sense to do this, as the handlers have no arguments,
but at the end of this porting work all handlers will have the same
structure.

Signed-off-by: Luiz Capitulino <address@hidden>
---
 migration.c |    2 +-
 migration.h |    3 ++-
 monitor.c   |   18 +++++++++---------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/migration.c b/migration.c
index ee64d41..024793f 100644
--- a/migration.c
+++ b/migration.c
@@ -72,7 +72,7 @@ void do_migrate(Monitor *mon, int detach, const char *uri)
     }
 }
 
-void do_migrate_cancel(Monitor *mon)
+void do_migrate_cancel(Monitor *mon, const struct qemu_dict *qdict)
 {
     MigrationState *s = current_migration;
 
diff --git a/migration.h b/migration.h
index 37c7f8e..97c0044 100644
--- a/migration.h
+++ b/migration.h
@@ -15,6 +15,7 @@
 #define QEMU_MIGRATION_H
 
 #include "qemu-common.h"
+#include "qemu-dict.h"
 
 #define MIG_STATE_ERROR                -1
 #define MIG_STATE_COMPLETED    0
@@ -51,7 +52,7 @@ void qemu_start_incoming_migration(const char *uri);
 
 void do_migrate(Monitor *mon, int detach, const char *uri);
 
-void do_migrate_cancel(Monitor *mon);
+void do_migrate_cancel(Monitor *mon, const struct qemu_dict *qdict);
 
 void do_migrate_set_speed(Monitor *mon, const char *value);
 
diff --git a/monitor.c b/monitor.c
index b46df28..46b3e0c 100644
--- a/monitor.c
+++ b/monitor.c
@@ -426,7 +426,7 @@ static void do_info_cpu_stats(Monitor *mon)
 }
 #endif
 
-static void do_quit(Monitor *mon)
+static void do_quit(Monitor *mon, const struct qemu_dict *qdict)
 {
     exit(0);
 }
@@ -559,7 +559,7 @@ static void do_singlestep(Monitor *mon, const char *option)
     }
 }
 
-static void do_stop(Monitor *mon)
+static void do_stop(Monitor *mon, const struct qemu_dict *qdict)
 {
     vm_stop(EXCP_INTERRUPT);
 }
@@ -571,7 +571,7 @@ struct bdrv_iterate_context {
     int err;
 };
 
-static void do_cont(Monitor *mon)
+static void do_cont(Monitor *mon, const struct qemu_dict *qdict)
 {
     struct bdrv_iterate_context context = { mon, 0 };
 
@@ -587,7 +587,7 @@ static void bdrv_key_cb(void *opaque, int err)
 
     /* another key was set successfully, retry to continue */
     if (!err)
-        do_cont(mon);
+        do_cont(mon, NULL);
 }
 
 static void encrypted_bdrv_it(void *opaque, BlockDriverState *bs)
@@ -1246,12 +1246,12 @@ static void do_boot_set(Monitor *mon, const char 
*bootdevice)
     }
 }
 
-static void do_system_reset(Monitor *mon)
+static void do_system_reset(Monitor *mon, const struct qemu_dict *qdict)
 {
     qemu_system_reset_request();
 }
 
-static void do_system_powerdown(Monitor *mon)
+static void do_system_powerdown(Monitor *mon, const struct qemu_dict *qdict)
 {
     qemu_system_powerdown_request();
 }
@@ -2638,7 +2638,7 @@ static void monitor_handle_command(Monitor *mon, const 
char *cmdline)
     void *str_allocated[MAX_ARGS];
     void *args[MAX_ARGS];
     struct qemu_dict *qdict;
-    void (*handler_0)(Monitor *mon);
+    void (*handler_d)(Monitor *mon, const struct qemu_dict *qdict);
     void (*handler_1)(Monitor *mon, void *arg0);
     void (*handler_2)(Monitor *mon, void *arg0, void *arg1);
     void (*handler_3)(Monitor *mon, void *arg0, void *arg1, void *arg2);
@@ -2940,8 +2940,8 @@ static void monitor_handle_command(Monitor *mon, const 
char *cmdline)
 
     switch(nb_args) {
     case 0:
-        handler_0 = cmd->handler;
-        handler_0(mon);
+        handler_d = cmd->handler;
+        handler_d(mon, qdict);
         break;
     case 1:
         handler_1 = cmd->handler;
-- 
1.6.4.rc3.12.gdf73a