From patchwork Thu Feb 11 01:49:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [03/21] Monitor: Convert do_cont() to cmd_new_ret() Date: Wed, 10 Feb 2010 15:49:49 -0000 From: Luiz Capitulino X-Patchwork-Id: 45080 Message-Id: <1265853007-27300-4-git-send-email-lcapitulino@redhat.com> To: qemu-devel@nongnu.org Cc: armbru@redhat.com Signed-off-by: Luiz Capitulino --- monitor.c | 8 ++++++-- qemu-monitor.hx | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index c1e0af8..cede368 100644 --- a/monitor.c +++ b/monitor.c @@ -1148,14 +1148,18 @@ struct bdrv_iterate_context { /** * do_cont(): Resume emulation. */ -static void do_cont(Monitor *mon, const QDict *qdict, QObject **ret_data) +static int do_cont(Monitor *mon, const QDict *qdict, QObject **ret_data) { struct bdrv_iterate_context context = { mon, 0 }; bdrv_iterate(encrypted_bdrv_it, &context); /* only resume the vm if all keys are set and valid */ - if (!context.err) + if (!context.err) { vm_start(); + return 0; + } else { + return -1; + } } static void bdrv_key_cb(void *opaque, int err) diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 8e51df0..0eab6db 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -318,7 +318,7 @@ ETEXI .params = "", .help = "resume emulation", .user_print = monitor_user_noop, - .mhandler.cmd_new = do_cont, + .cmd_new_ret = do_cont, }, STEXI