From cf84074958e4a04970ca653a2fe0d1e791183e0a Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Mon, 29 Mar 2010 16:14:38 -0300 Subject: [PATCH 03/23] Monitor: Convert do_cont() to cmd_new_ret() RH-Author: Luiz Capitulino Message-id: <1269879298-30711-4-git-send-email-lcapitulino@redhat.com> Patchwork-id: 8165 O-Subject: [PATCH 03/23] Monitor: Convert do_cont() to cmd_new_ret() Bugzilla: 563491 RH-Acked-by: Markus Armbruster RH-Acked-by: Juan Quintela RH-Acked-by: Kevin Wolf Signed-off-by: Luiz Capitulino Signed-off-by: Anthony Liguori (cherry picked from commit d5a7b38f5c9f28c258595f327e28a1b88ffd370f) --- monitor.c | 8 ++++++-- qemu-monitor.hx | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) Signed-off-by: Eduardo Habkost --- monitor.c | 8 ++++++-- qemu-monitor.hx | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index 595ad58..0d5993d 100644 --- a/monitor.c +++ b/monitor.c @@ -1186,14 +1186,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 a8afb0b..bbaf080 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -304,7 +304,7 @@ ETEXI .params = "", .help = "resume emulation", .user_print = monitor_user_noop, - .mhandler.cmd_new = do_cont, + .cmd_new_ret = do_cont, }, STEXI -- 1.7.0.3