Patchwork [11/15] monitor: Convert do_cont() to QObject

login
register
mail settings
Submitter Luiz Capitulino
Date Oct. 7, 2009, 12:27 a.m.
Message ID <1254875232-25012-12-git-send-email-lcapitulino@redhat.com>
Download mbox | patch
Permalink /patch/35183/
State Changes Requested
Headers show

Comments

Luiz Capitulino - Oct. 7, 2009, 12:27 a.m.
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.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 monitor.c       |    7 +++++--
 qemu-monitor.hx |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

Patch

diff --git a/monitor.c b/monitor.c
index 198f0fc..094b090 100644
--- a/monitor.c
+++ b/monitor.c
@@ -615,7 +615,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 };
 
@@ -631,7 +634,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 eef0c8e..935e8ea 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -311,7 +311,7 @@  ETEXI
         .name       = "c|cont",
         .args_type  = "",
         .handler    = do_cont,
-        .user_print = NULL,
+        .user_print = monitor_user_noop,
         .params     = "",
         .help       = "resume emulation",
     },