aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--monitor.c7
-rw-r--r--qemu-monitor.hx3
2 files changed, 7 insertions, 3 deletions
diff --git a/monitor.c b/monitor.c
index ab15289a9c..d393ad5271 100644
--- 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 3efc716989..8dca4f19d4 100644
--- 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