monitor: Convert do_cont() to QObject

Appropriate error handling support will be needed to have
encrypted images working under the future machine protocol,
but this initial conversion will work with the current
user protocol.

Patchworks-ID: 35348
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/monitor.c b/monitor.c
index ab15289..d393ad5 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -614,7 +614,10 @@ struct bdrv_iterate_context {
     int err;
 };
 
-static void do_cont(Monitor *mon, const QDict *qdict)
+/**
+ * do_cont(): Resume emulation.
+ */
+static void do_cont(Monitor *mon, const QDict *qdict, QObject **ret_data)
 {
     struct bdrv_iterate_context context = { mon, 0 };
 
@@ -630,7 +633,7 @@ static void bdrv_key_cb(void *opaque, int err)
 
     /* another key was set successfully, retry to continue */
     if (!err)
-        do_cont(mon, NULL);
+        do_cont(mon, NULL, NULL);
 }
 
 static void encrypted_bdrv_it(void *opaque, BlockDriverState *bs)

diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index 3efc716..8dca4f1 100644 (file)
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -301,7 +301,8 @@ ETEXI
         .args_type  = "",
         .params     = "",
         .help       = "resume emulation",
-        .mhandler.cmd = do_cont,
+        .user_print = monitor_user_noop,
+        .mhandler.cmd_new = do_cont,
     },
 
 STEXI