diff options
| author | Luiz Capitulino <lcapitulino@redhat.com> | 2009-10-07 13:42:00 -0300 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-08 21:17:19 -0500 |
| commit | a1f896a04161ed429532da3ff220776ca0b1fbc9 (patch) | |
| tree | 63336b683922cb60bdd86fdd8578d32e9143322f | |
| parent | 4307666463cb94f22f59bb47f701ff2d4911aae0 (diff) | |
| download | qemu-a1f896a04161ed429532da3ff220776ca0b1fbc9.tar.gz | |
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>
| -rw-r--r-- | monitor.c | 7 | ||||
| -rw-r--r-- | qemu-monitor.hx | 3 |
2 files changed, 7 insertions, 3 deletions
@@ -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 |