From a1f896a04161ed429532da3ff220776ca0b1fbc9 Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Wed, 7 Oct 2009 13:42:00 -0300 Subject: [PATCH] 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 Signed-off-by: Anthony Liguori --- monitor.c | 7 +++++-- qemu-monitor.hx | 3 ++- 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